Changeset 8061a6a

Timestamp:

Feb 8, 2011, 2:27:47 AM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

6965867

Parents:

8d553bf

git-author:

Anders Kaseorg <andersk@mit.edu> (02/06/11 23:33:08)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/08/11 02:27:47)

Message:

Move glib libraries from LDFLAGS to LIBS

This fixes linker errors on wheezy and natty:
http://wiki.debian.org/ToolChain/DSOLinking

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: David Benjamin <davidben@mit.edu>

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -103 +103 @@
 fi
 
-dnl Add LDFLAGS for embedded perl
+dnl Add LIBS for embedded perl
 FOO=`perl -MExtUtils::Embed -e ldopts`
 AC_MSG_NOTICE([Adding perl LIBS ${FOO}])
@@ -114 +114 @@
                      [AC_MSG_WARN([PAR.pm not found. Loadable modules will be disabled.])])
 
-dnl Add CFLAGS and LDFLAGS for glib-2.0
+dnl Add CFLAGS and LIBS for glib-2.0
 PKG_CHECK_MODULES(GLIB,[glib-2.0 gobject-2.0])
 
 AC_MSG_NOTICE([Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}])
 AM_CFLAGS="${GLIB_CFLAGS} ${AM_CFLAGS}"
-AC_MSG_NOTICE([Adding glib-2.0 LDFLAGS ${GLIB_LIBS}])
-AM_LDFLAGS="${GLIB_LIBS} ${AM_LDFLAGS}"
+AC_MSG_NOTICE([Adding glib-2.0 LIBS ${GLIB_LIBS}])
+LIBS="${GLIB_LIBS} ${LIBS}"
 
 if test "x${prefix}" = "xNONE"; then
@@ -146 +146 @@
 
 AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_LDFLAGS])
 AC_SUBST([LIBFAIM_CFLAGS])