[Aptitude-svn-commit] r4321 - branches/aptitude-0.3/aptitude

[Daniel Burrows]

Author: dburrows
Date: Wed Sep 28 03:41:31 2005
New Revision: 4321

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/configure.ac
Log:
Put libraries detected by configure into LIBS, not LDFLAGS.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Sep 28 03:41:31 2005
@@ -1,5 +1,9 @@
 2005-09-27  Daniel Burrows  <dburrows at debian.org>
 
+	* configure.ac:
+
+	  Put libraries detected by configure into LIBS, not LDFLAGS.
+
 	* configure.ac, src/generic/util/Makefile.am, src/generic/util/exception.cc, src/generic/util/exception.h, src/main.cc, tests/Makefile.am:
 
 	  Add support for backtracing the program when creating an

Modified: branches/aptitude-0.3/aptitude/configure.ac
==============================================================================
--- branches/aptitude-0.3/aptitude/configure.ac	(original)
+++ branches/aptitude-0.3/aptitude/configure.ac	Wed Sep 28 03:41:31 2005
@@ -35,7 +35,7 @@
 PKG_CHECK_MODULES(SIGC, sigc++-2.0)
 
 CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS"
-LDFLAGS="$LDFLAGS $SIGC_LIBS"
+LIBS="$LIBS $SIGC_LIBS"
 AC_DEFINE_UNQUOTED(SIGC_VERSION, "$sigc_version", [The version of libsigc++ with which the program was compiled])
 
 dnl Checks for header files.
@@ -135,10 +135,10 @@
 then
   AC_CHECK_HEADER(pthread.h,
 	CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-	LDFLAGS="$LDFLAGS -lpthread"
+	LIBS="$LIBS -lpthread"
 	[AC_DEFINE(HAVE_LIBPTHREAD,  , [Define if pthread is available])]
 	,
-	[AC_MSG_WARN([POSIX thread header not installed -- configuring without threading support])])
+	[AC_MSG_ERROR([POSIX thread header not installed])])
 fi
 
 WERROR="-Werror"