aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2012-12-09 09:37:01 +0100
committerAndreas Schwab2012-12-09 09:37:01 +0100
commit75d7aa242df8864cce019474ac51b6eca080e28b (patch)
tree4d272de1b4ba69fdb3b6077be4ce15aeabad36d3
parent5dea55d2fa53b12d088ac2ed7dd695a7fdf392b8 (diff)
downloademacs-75d7aa242df8864cce019474ac51b6eca080e28b.tar.gz
emacs-75d7aa242df8864cce019474ac51b6eca080e28b.zip
* configure.ac: Fix source command in .gdbinit.
Don't quote $MAKEINFO.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 04dc73eb683..eb572b26b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-12-09 Andreas Schwab <schwab@linux-m68k.org>
2
3 * configure.ac: Fix source command in .gdbinit.
4 Don't quote $MAKEINFO.
5
12012-12-09 Paul Eggert <eggert@cs.ucla.edu> 62012-12-09 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Allow spaces in some configuration vars (Bug#13078). 8 Allow spaces in some configuration vars (Bug#13078).
diff --git a/configure.ac b/configure.ac
index ea97874da0d..3303f80c3e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -813,7 +813,7 @@ dnl By this stage, configure has already checked for egrep and set EGREP,
813dnl or exited with an error if no egrep was found. 813dnl or exited with an error if no egrep was found.
814if test "$MAKEINFO" != "no"; then 814if test "$MAKEINFO" != "no"; then
815 case ` 815 case `
816 "$MAKEINFO" --version 2> /dev/null | 816 $MAKEINFO --version 2> /dev/null |
817 $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)' 817 $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'
818 ` in 818 ` in
819 '') MAKEINFO=no;; 819 '') MAKEINFO=no;;
@@ -1194,7 +1194,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
1194 *** The pkg-config script could not be found. Make sure it is in your path, or give the full name of pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config.])], [$4]) 1194 *** The pkg-config script could not be found. Make sure it is in your path, or give the full name of pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config.])], [$4])
1195 else 1195 else
1196 PKG_CONFIG_MIN_VERSION=0.9.0 1196 PKG_CONFIG_MIN_VERSION=0.9.0
1197 if "$PKG_CONFIG" --atleast-pkgconfig-version "$PKG_CONFIG_MIN_VERSION"; then 1197 if "$PKG_CONFIG" --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
1198 AC_MSG_CHECKING(for $2) 1198 AC_MSG_CHECKING(for $2)
1199 1199
1200 if "$PKG_CONFIG" --exists "$2" 2>&AS_MESSAGE_LOG_FD && 1200 if "$PKG_CONFIG" --exists "$2" 2>&AS_MESSAGE_LOG_FD &&
@@ -4557,7 +4557,7 @@ ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
4557AC_CONFIG_COMMANDS([gdbinit], [ 4557AC_CONFIG_COMMANDS([gdbinit], [
4558if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then 4558if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
4559 echo creating src/.gdbinit 4559 echo creating src/.gdbinit
4560 echo "source '$srcdir/src/.gdbinit'" > src/.gdbinit 4560 echo "source $srcdir/src/.gdbinit" > src/.gdbinit
4561fi 4561fi
4562]) 4562])
4563 4563