uuid.h should only be included when libuuid is detected

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8b79f9a9566b3809eced77d07ac392a1ab5b35c6..aa0fac34a6b8af3f10fdac8c65ea98cc711e53ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,23 +42,7 @@ AC_PROG_MAKE_SET
 LT_INIT
 
 ## Checks for libraries.
-AC_CHECK_LIB([dl], [dlopen],
-[
-       have_libdl=yes
-],
-[
-       #libdl not found, check for dlopen in libc.
-       AC_CHECK_LIB([c], [dlopen],
-       [
-               have_libc_dl=yes
-       ],
-       [
-               AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
-       ])
-])
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
-
+AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 
 # Check for libuuid
@@ -75,7 +59,7 @@ AC_CHECK_LIB([uuid], [uuid_generate],
                have_libc_uuid=yes
        ],
        [
-               AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+               AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify its location.])
        ])
 ]
 )
@@ -116,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()])
@@ -217,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)
         ])
@@ -262,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])
        ])
 ])