[25375] in Source-Commits
/svn/athena r24934 - in trunk/athena/bin/athdir: . debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Thu Feb 3 14:13:53 2011
Date: Thu, 3 Feb 2011 14:13:46 -0500
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201102031913.p13JDkeO030780@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-02-03 14:13:46 -0500 (Thu, 03 Feb 2011)
New Revision: 24934
Modified:
trunk/athena/bin/athdir/configure.ac
trunk/athena/bin/athdir/debian/changelog
Log:
In athdir:
* In configure.ac, add libathdir's LIBS to LIBS, not LDFLAGS. If the
linker is picky about the order of objects on the command line (as
Natty's appears to be), this fixes a FTBFS.
Modified: trunk/athena/bin/athdir/configure.ac
===================================================================
--- trunk/athena/bin/athdir/configure.ac 2011-02-03 17:51:47 UTC (rev 24933)
+++ trunk/athena/bin/athdir/configure.ac 2011-02-03 19:13:46 UTC (rev 24934)
@@ -11,7 +11,7 @@
AC_MSG_NOTICE([Adding athdir CFLAGS ${ATHDIR_CFLAGS}])
CFLAGS="${ATHDIR_CFLAGS} ${CFLAGS}"
AC_MSG_NOTICE([Adding athdir LDFLAGS ${ATHDIR_LIBS}])
-LDFLAGS="${ATHDIR_LIBS} ${LDFLAGS}"
+LIBS="${ATHDIR_LIBS} ${LIBS}"
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
Modified: trunk/athena/bin/athdir/debian/changelog
===================================================================
--- trunk/athena/bin/athdir/debian/changelog 2011-02-03 17:51:47 UTC (rev 24933)
+++ trunk/athena/bin/athdir/debian/changelog 2011-02-03 19:13:46 UTC (rev 24934)
@@ -1,3 +1,11 @@
+debathena-athdir (10.0.1-0debathena2) unstable; urgency=low
+
+ * In configure.ac, add libathdir's LIBS to LIBS, not LDFLAGS. If the
+ linker is picky about the order of objects on the command line (as
+ Natty's appears to be), this fixes a FTBFS.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Thu, 03 Feb 2011 14:11:11 -0500
+
debathena-athdir (10.0.1-0debathena1) unstable; urgency=low
* Update autogoo for the 21st century.
