X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=aa0fac34a6b8af3f10fdac8c65ea98cc711e53ee;hb=8536db0b17d16e73a6508b1fafadd0550f789345;hp=21dca42c45fa563054dec166c79f9dff32ef6576;hpb=eade58d0cba1a300e37a4b1fd4b2588f134d08c9;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 21dca42c..aa0fac34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,18 +49,22 @@ AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([uuid], [uuid_generate],
 [
 	AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBUUID], 1, [Has libuuid support.])
+	have_libuuid=yes
 ],
 [
 	# libuuid not found, check for uuid_create in libc.
 	AC_CHECK_LIB([c], [uuid_create],
 	[
 		AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
+		have_libc_uuid=yes
 	],
 	[
 		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify its location.])
 	])
 ]
 )
+AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
+AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
 
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
@@ -96,7 +100,7 @@ AS_IF([test "x$TEXINFO" != "xyes"],[
 # URCU
 
 # urcu - check if we just find the headers it out of the box.
-AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.
+AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location.
 This error can also occur when the liburcu package's configure script has not been run.])])
 
 AC_MSG_CHECKING([caa_likely()])
@@ -197,9 +201,9 @@ AS_IF([test $JAVA_JDK],[
 	AS_IF([test -d $JAVA_JDK],[
                 AC_MSG_RESULT([using Java includes in $JAVA_SDK])
                 SUBDIRS=`find $JAVA_JDK/include -type d`
-		CFLAGS+=" "
-                CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
-		CFLAGS+=" "
+		CPPFLAGS+=" "
+                CPPFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
+		CPPFLAGS+=" "
         ],[
                 AC_MSG_ERROR(Unable to find Java include files in $JAVA_JDK)
         ])
@@ -242,7 +246,7 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 		AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1])
 	],[
 		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([The sdt.h integration was requested but the STAP_PROBEV define cannot be used. Make sure it is installed, and up to date, or use CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h])
+		AC_MSG_ERROR([The sdt.h integration was requested but the STAP_PROBEV define cannot be used. Make sure it is installed, and up to date, or use CPPFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h])
 	])
 ])