[Emacs-diffs] /srv/bzr/emacs/trunk r106652: * configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS

[Jan D.]

------------------------------------------------------------
revno: 106652
fixes bug(s): http://debbugs.gnu.org/10230
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-10 13:33:07 +0100
message:
  * configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS
  instead of LDFLAGS.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-12-04 08:02:42 +0000
+++ b/ChangeLog 2011-12-10 12:33:07 +0000
@@ -1,3 +1,8 @@
+2011-12-10  Jan Djärv  <address@hidden>
+
+       * configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS
+       instead of LDFLAGS (Bug#10230).
+
 2011-12-03  Paul Eggert  <address@hidden>
 
        * INSTALL.BZR: Mention configure -C, --disable-maintainer-mode.

=== modified file 'configure.in'
--- a/configure.in      2011-12-03 20:19:03 +0000
+++ b/configure.in      2011-12-10 12:33:07 +0000
@@ -1174,9 +1174,9 @@
   PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
   if test $HAVE_ALSA = yes; then
     SAVE_CFLAGS="$CFLAGS"
-    SAVE_LDFLAGS="$LDFLAGS"
+    SAVE_LIBS="$LIBS"
     CFLAGS="$ALSA_CFLAGS $CFLAGS"
-    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+    LIBS="$ALSA_LIBS $LIBS"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], 
[[snd_lib_error_set_handler (0);]])],
                     emacs_alsa_normal=yes,
                    emacs_alsa_normal=no)
@@ -1192,7 +1192,7 @@
     fi
 
     CFLAGS="$SAVE_CFLAGS"
-    LDFLAGS="$SAVE_LDFLAGS"
+    LIBS="$SAVE_LIBS"
     LIBSOUND="$LIBSOUND $ALSA_LIBS"
     CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
     AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
@@ -2039,12 +2039,12 @@
 
 if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
     SAVE_CFLAGS="$CFLAGS"
-    SAVE_LDFLAGS="$LDFLAGS"
+    SAVE_LIBS="$LIBS"
     CFLAGS="$SETTINGS_CFLAGS $CFLAGS"
-    LDFLAGS="$SETTINGS_LIBS $LDFLAGS"
+    LIBS="$SETTINGS_LIBS $LIBS"
     AC_CHECK_FUNCS([g_type_init])
     CFLAGS="$SAVE_CFLAGS"
-    LDFLAGS="$SAVE_LDFLAGS"
+    LIBS="$SAVE_LIBS"
 fi
 AC_SUBST(SETTINGS_CFLAGS)
 AC_SUBST(SETTINGS_LIBS)