Changeset 1282 for pjproject/trunk/aconfigure.ac

Timestamp:

May 16, 2007 1:41:00 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticet #277: GUID generation cannot generate more than 2^{16 unique numbers (thanks Igor Sobinov)}

File:

• pjproject/trunk/aconfigure.ac (modified) (3 diffs)

pjproject/trunk/aconfigure.ac

@@ -49 +49 @@
 AC_CHECK_LIB(rt,puts)
 AC_CHECK_LIB(nsl,puts)
+AC_CHECK_LIB(uuid,uuid_generate)
+AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
 
 AC_MSG_RESULT([Setting PJ_M_NAME to $target_cpu])
@@ -152 +154 @@
 AC_CHECK_HEADER(winsock.h,[AC_DEFINE(PJ_HAS_WINSOCK_H,1)])
 AC_CHECK_HEADER(winsock2.h,[AC_DEFINE(PJ_HAS_WINSOCK2_H,1)])
+AC_CHECK_HEADER(uuid/uuid.h,[ac_has_uuid_h=1])
 
 AC_MSG_RESULT([Setting PJ_OS_NAME to $target])
@@ -233 +236 @@
         ;;
   *)
-        ac_os_objs="file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o ioqueue_select.o"
-        ;;
-esac
+        ac_os_objs="file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o ioqueue_select.o"
+        # UUID
+        if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
+                ac_os_objs="$ac_os_objs guid_uuid.o"
+        else
+                ac_os_objs="$ac_os_objs guid_simple.o"
+        fi
+        ;;
+esac
+