X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=5b87db91228acf92c49f01d662b7d6a9124e7893;hb=98477e49b11470424a2642af6a9312a1f391fe97;hp=33b00111f358b8f6df07d055b5e64354569735e4;hpb=a6c09be3c2031a251412f15da48364359ce8d6e9;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 33b00111f..5b87db912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,27 +360,24 @@ AC_DEFINE_UNQUOTED([CONFIG_LTTNG_SYSTEM_CONFIGDIR],"$CONFDIR", [LTTng system con
 
 AC_DEFINE_DIR([CONFIG_LTTNG_SYSTEM_DATADIR],[datadir], [LTTng system data directory.])
 
-#
-# Check for pthread
-AC_CHECK_LIB([pthread], [pthread_create], [],
-	[AC_MSG_ERROR([Cannot find libpthread. Use LDFLAGS=-Ldir to specify its location.])]
-)
-
 # Check libpopt
 PKG_CHECK_MODULES([POPT], [popt],
-	[LIBS="$LIBS $POPT_LIBS"],
-	[
-		AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
-		AC_MSG_WARN([Finding libpopt without pkg-config.])
-		AC_CHECK_LIB([popt],
-			[poptGetContext],
-			[],
-			[
-				 AC_MSG_ERROR([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])
-			]
-		)
-	]
+  [
+    dnl PKG_CHECK_MODULES defines POPT_LIBS
+  ],
+  [
+    AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
+    AC_MSG_WARN([Finding libpopt without pkg-config.])
+    AC_CHECK_LIB([popt],
+      [poptGetContext],
+      [POPT_LIBS="-lpopt"],
+      [
+        AC_MSG_FAILURE([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])
+      ]
+    )
+  ]
 )
+AC_SUBST(POPT_LIBS)
 
 PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6])