this should work

Author: berkerpeksag

Modules/_uuidmodule.c

@@ -7,7 +7,7 @@
 static PyObject *
 py_uuid_generate_time_safe(void)
 {
-#ifdef HAVE_UUID_GENERATE_TIME_SAFE
+#if defined(HAVE_UUID_GENERATE_TIME_SAFE) && HAVE_UUID_GENERATE_TIME_SAFE
     uuid_t out;
     int res;
 
@@ -38,7 +38,7 @@ PyInit__uuid(void)
 {
     PyObject *mod;
     assert(sizeof(uuid_t) == 16);
-#ifdef HAVE_UUID_GENERATE_TIME_SAFE
+#if defined(HAVE_UUID_GENERATE_TIME_SAFE) && HAVE_UUID_GENERATE_TIME_SAFE
     int has_uuid_generate_time_safe = 1;
 #else
     int has_uuid_generate_time_safe = 0;

configure

@@ -9512,70 +9512,51 @@ _ACEOF
 fi
 	# Dynamic linking for HP-UX
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate_time_safe" >&5
-$as_echo_n "checking for library containing uuid_generate_time_safe... " >&6; }
-if ${ac_cv_search_uuid_generate_time_safe+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if uuid_generate_time_safe() available" >&5
+$as_echo_n "checking if uuid_generate_time_safe() available... " >&6; }
+if ${ax_cv_uuid_generate_time_safe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test program execution failed" >&5
+$as_echo "$as_me: WARNING: test program execution failed" >&2;}
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char uuid_generate_time_safe ();
+    #include <uuid/uuih.h>
 int
 main ()
 {
-return uuid_generate_time_safe ();
+
+        uuid_t out;
+        uuid_generate_time_safe(out);
+
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' uuid; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_uuid_generate_time_safe=$ac_res
+if ac_fn_c_try_run "$LINENO"; then :
+  ax_cv_uuid_generate_time_safe=yes
+else
+  ax_cv_uuid_generate_time_safe=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_uuid_generate_time_safe+:} false; then :
-  break
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-done
-if ${ac_cv_search_uuid_generate_time_safe+:} false; then :
 
-else
-  ac_cv_search_uuid_generate_time_safe=no
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate_time_safe" >&5
-$as_echo "$ac_cv_search_uuid_generate_time_safe" >&6; }
-ac_res=$ac_cv_search_uuid_generate_time_safe
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_uuid_generate_time_safe" >&5
+$as_echo "$ax_cv_uuid_generate_time_safe" >&6; }
+if test "$ax_cv_uuid_generate_time_safe" = yes; then :
 
->...
 $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
 
-
 else
 
->...
 $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 0" >>confdefs.h
 
-
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
 $as_echo_n "checking for library containing sem_init... " >&6; }

configure.ac

@@ -2677,11 +2677,19 @@ AC_CHECK_LIB(sendfile, sendfile)
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
 
-AC_SEARCH_LIBS([uuid_generate_time_safe], [uuid], [
->...AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1], [Define if uuid_generate_time_safe() exists.])
-], [
->...AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [0], [Define if uuid_generate_time_safe() exists.])
-]
+AC_CACHE_CHECK([if uuid_generate_time_safe() available],
+[ax_cv_uuid_generate_time_safe],
+[AC_RUN_IFELSE([
+    AC_LANG_PROGRAM([#include <uuid/uuih.h>], [
+        uuid_t out;
+        uuid_generate_time_safe(out);
+        ])],
+    [ax_cv_uuid_generate_time_safe=yes],
+    [ax_cv_uuid_generate_time_safe=no],
+    [AC_MSG_WARN([test program execution failed])])])
+AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes],
+      [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1], [Define if uuid_generate_time_safe() exists.])],
+      [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [0], [Define if uuid_generate_time_safe() exists.])])
 
 AC_SEARCH_LIBS(sem_init, pthread rt posix4) 	# 'Real Time' functions on Solaris
 						# posix4 on Solaris 2.6