svn commit: r168287 - in /apr/apr/trunk: configure.in include/apr.h.in misc/unix/rand.c

[pq...@apache.org]

Author: pquerna
Date: Wed May  4 23:52:18 2005
New Revision: 168287

URL: http://svn.apache.org/viewcvs?rev=168287&view=rev
Log:
Use AC_CHECK_HEADERS to find the uuid header files.

Suggested By: Joe Orton

Modified:
    apr/apr/trunk/configure.in
    apr/apr/trunk/include/apr.h.in
    apr/apr/trunk/misc/unix/rand.c

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/configure.in?rev=168287&r1=168286&r2=168287&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Wed May  4 23:52:18 2005
@@ -1005,7 +1005,6 @@
     tpfio.h		\
     unistd.h		\
     unix.h		\
-    uuid.h		\
     arpa/inet.h		\
     kernel/OS.h		\
     net/errno.h		\
@@ -1030,8 +1029,7 @@
     sys/types.h		\
     sys/uio.h		\
     sys/un.h		\
-    sys/wait.h          \
-    uuid/uuid.h)
+    sys/wait.h)
 
 # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
 # being included by itself.  Check for <netinet/tcp.h> manually,
@@ -1083,8 +1081,6 @@
 AC_SUBST(unistdh)
 AC_SUBST(signalh)
 AC_SUBST(sys_waith)
-AC_SUBST(uuidh)
-AC_SUBST(uuid_uuidh)
 AC_SUBST(pthreadh)
 AC_SUBST(semaphoreh)
 
@@ -1820,6 +1816,9 @@
 dnl ----------------------------- Checking for UUID Support 
 echo "${nl}Checking for OS UUID Support..."
 osuuid="0"
+
+AC_CHECK_HEADERS(uuid/uuid.h uuid.h)
+
 AC_CHECK_FUNCS(uuid_create, [osuuid="1"
     AC_DEFINE([HAVE_UUID_CREATE], 1, [Define if libc has uuid_create])], [])
 

Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr.h.in?rev=168287&r1=168286&r2=168287&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Wed May  4 23:52:18 2005
@@ -101,8 +101,6 @@
 #define APR_HAVE_SYS_WAIT_H      @sys_waith@
 #define APR_HAVE_TIME_H          @timeh@
 #define APR_HAVE_UNISTD_H        @unistdh@
-#define APR_HAVE_UUID_UUID_H     @uuid_uuidh@
-#define APR_HAVE_UUID_H          @uuidh@
 
 /** @} */
 

Modified: apr/apr/trunk/misc/unix/rand.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/misc/unix/rand.c?rev=168287&r1=168286&r2=168287&view=diff
==============================================================================
--- apr/apr/trunk/misc/unix/rand.c (original)
+++ apr/apr/trunk/misc/unix/rand.c Wed May  4 23:52:18 2005
@@ -35,10 +35,10 @@
 #if APR_HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
-#if APR_HAVE_UUID_UUID_H
+#if HAVE_UUID_UUID_H
 #include <uuid/uuid.h>
 #endif
-#if APR_HAVE_UUID_H
+#if HAVE_UUID_H
 #include <uuid.h>
 #endif