X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=73c7b897e522e169437437bba582ffe90e2f6ca7;hb=refs%2Fheads%2Fcygwin-2.0-experimental;hp=de1c0c5fd18c1a9e5236641b596c4c651952cb2a;hpb=5a8ebacfa816fc73737c517155c9ee26a8dc9761;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index de1c0c5f..73c7b897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,18 +80,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])
@@ -165,6 +169,10 @@ got it
                     [ust_cv_i386_is_x86_64=no])
                     CPPFLAGS="$save_CPPFLAGS"])
     ;;
+    # All symbols must be resolved at link time on Cygwin/MinGW/Windows,
+    # else libtool will not be able to build shared libraries.
+    *-*-cygwin*)
+    LDFLAGS="-Wl,-no-undefined $LDFLAGS";;
 esac
 
 AC_MSG_CHECKING([library format for the host system])
@@ -273,6 +281,13 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 
 #	liblttng-ust-java/Makefile
 
+# Disabled for now, because these libraries
+# rely on the dlsym(3) RTLD_NEXT GNU extension.
+# This is not implemented in Cygwin.
+#liblttng-ust-fork/Makefile
+#liblttng-ust-libc-wrapper/Makefile
+#tests/fork/Makefile
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -284,15 +299,12 @@ AC_CONFIG_FILES([
 	liblttng-ust-comm/Makefile
 	liblttng-ust/Makefile
 	liblttng-ust-ctl/Makefile
-	liblttng-ust-fork/Makefile
-	liblttng-ust-libc-wrapper/Makefile
 	tools/Makefile
 	tests/Makefile
 	tests/hello/Makefile
 	tests/hello-static-lib/Makefile
 	tests/hello.cxx/Makefile
 	tests/demo/Makefile
-	tests/fork/Makefile
 	tests/ust-basic-tracing/Makefile
 	tests/ust-multi-test/Makefile
 	lttng-ust.pc