Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
46d14be7
Commit
46d14be7
authored
Dec 10, 2011
by
Jan Djärv
Browse files
* configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS
instead of LDFLAGS. Fixes: debbugs:10230
parent
b8830d28
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
ChangeLog
ChangeLog
+5
-0
configure.in
configure.in
+6
-6
No files found.
ChangeLog
View file @
46d14be7
2011-12-10 Jan Djärv <jan.h.d@swipnet.se>
* configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS
instead of LDFLAGS (Bug#10230).
2011-12-03 Paul Eggert <eggert@cs.ucla.edu>
* INSTALL.BZR: Mention configure -C, --disable-maintainer-mode.
...
...
configure.in
View file @
46d14be7
...
...
@@ -1174,9 +1174,9 @@ if test "${with_sound}" != "no"; then
PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
if test $HAVE_ALSA = yes; then
SAVE_CFLAGS="$CFLAGS"
SAVE_L
DFLAGS="$LDFLAG
S"
SAVE_L
IBS="$LIB
S"
CFLAGS="$ALSA_CFLAGS $CFLAGS"
L
DFLAG
S="$ALSA_LIBS $L
DFLAG
S"
L
IB
S="$ALSA_LIBS $L
IB
S"
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 @@ if test "${with_sound}" != "no"; then
fi
CFLAGS="$SAVE_CFLAGS"
L
DFLAG
S="$SAVE_L
DFLAG
S"
L
IB
S="$SAVE_L
IB
S"
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 @@ fi
if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
SAVE_CFLAGS="$CFLAGS"
SAVE_L
DFLAGS="$LDFLAG
S"
SAVE_L
IBS="$LIB
S"
CFLAGS="$SETTINGS_CFLAGS $CFLAGS"
L
DFLAG
S="$SETTINGS_LIBS $L
DFLAG
S"
L
IB
S="$SETTINGS_LIBS $L
IB
S"
AC_CHECK_FUNCS([g_type_init])
CFLAGS="$SAVE_CFLAGS"
L
DFLAG
S="$SAVE_L
DFLAG
S"
L
IB
S="$SAVE_L
IB
S"
fi
AC_SUBST(SETTINGS_CFLAGS)
AC_SUBST(SETTINGS_LIBS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment