aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2010-04-21 18:41:29 +0200
committerJan Djärv2010-04-21 18:41:29 +0200
commite765bf582cd4da0092f431536bc06aed78d5b762 (patch)
tree19d9c51968be289f5cf8b9cea87a5bd2565a1d2e
parent20fe03ad8549ef41bcd79a4a0c0d683b1df2318b (diff)
downloademacs-e765bf582cd4da0092f431536bc06aed78d5b762.tar.gz
emacs-e765bf582cd4da0092f431536bc06aed78d5b762.zip
configure.in: Change "if test ! -f" to "if ! test -f".
Regenerate configure.
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure25
-rw-r--r--configure.in2
3 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d56bf847d9..dcb6b0ce2f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12010-04-21 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.in: Change "if test ! -f" to "if ! test -f".
4
12010-04-21 Glenn Morris <rgm@gnu.org> 52010-04-21 Glenn Morris <rgm@gnu.org>
2 6
3 * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles. 7 * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
diff --git a/configure b/configure
index a4611888512..dcbb6a693af 100755
--- a/configure
+++ b/configure
@@ -714,8 +714,10 @@ RSVG_CFLAGS
714RSVG_LIBS 714RSVG_LIBS
715GTK_CFLAGS 715GTK_CFLAGS
716GTK_LIBS 716GTK_LIBS
717GTK_OBJ
717DBUS_CFLAGS 718DBUS_CFLAGS
718DBUS_LIBS 719DBUS_LIBS
720DBUS_OBJ
719GCONF_CFLAGS 721GCONF_CFLAGS
720GCONF_LIBS 722GCONF_LIBS
721LIBSELINUX_LIBS 723LIBSELINUX_LIBS
@@ -735,6 +737,7 @@ LIBPNG
735LIBTIFF 737LIBTIFF
736LIBGIF 738LIBGIF
737LIBGPM 739LIBGPM
740LIBXSM
738ALLOCA 741ALLOCA
739liblockfile 742liblockfile
740LIBS_MAIL 743LIBS_MAIL
@@ -782,6 +785,8 @@ GNUSTEP_SYSTEM_LIBRARIES
782GNU_OBJC_CFLAGS 785GNU_OBJC_CFLAGS
783LIB_SRC_EXTRA_INSTALLABLES 786LIB_SRC_EXTRA_INSTALLABLES
784OTHER_FILES 787OTHER_FILES
788XMENU_OBJ
789XOBJ
785LTLIBOBJS' 790LTLIBOBJS'
786ac_subst_files='' 791ac_subst_files=''
787ac_user_opts=' 792ac_user_opts='
@@ -11578,6 +11583,7 @@ $as_echo "$as_me: error: $GTK_PKG_ERRORS" >&2;}
11578fi 11583fi
11579 11584
11580 11585
11586GTK_OBJ=
11581if test x"$pkg_check_gtk" = xyes; then 11587if test x"$pkg_check_gtk" = xyes; then
11582 11588
11583 11589
@@ -11699,6 +11705,7 @@ cat >>confdefs.h <<\_ACEOF
11699#define USE_GTK 1 11705#define USE_GTK 1
11700_ACEOF 11706_ACEOF
11701 11707
11708 GTK_OBJ=gtkutil.o
11702 USE_X_TOOLKIT=none 11709 USE_X_TOOLKIT=none
11703 if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then 11710 if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then
11704 : 11711 :
@@ -11718,6 +11725,7 @@ $as_echo "$as_me: WARNING: Your version of Gtk+ will have problems with
11718fi 11725fi
11719 11726
11720 11727
11728
11721if test "${HAVE_GTK}" = "yes"; then 11729if test "${HAVE_GTK}" = "yes"; then
11722 11730
11723 if test "$with_toolkit_scroll_bars" != no; then 11731 if test "$with_toolkit_scroll_bars" != no; then
@@ -12409,6 +12417,7 @@ _ACEOF
12409fi 12417fi
12410 12418
12411HAVE_DBUS=no 12419HAVE_DBUS=no
12420DBUS_OBJ=
12412if test "${with_dbus}" = "yes"; then 12421if test "${with_dbus}" = "yes"; then
12413 12422
12414 succeeded=no 12423 succeeded=no
@@ -12611,9 +12620,11 @@ _ACEOF
12611fi 12620fi
12612done 12621done
12613 12622
12623 DBUS_OBJ=dbusbind.o
12614 fi 12624 fi
12615fi 12625fi
12616 12626
12627
12617HAVE_GCONF=no 12628HAVE_GCONF=no
12618if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then 12629if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
12619 12630
@@ -16069,6 +16080,7 @@ fi
16069 16080
16070### Use session management (-lSM -lICE) if available 16081### Use session management (-lSM -lICE) if available
16071HAVE_X_SM=no 16082HAVE_X_SM=no
16083LIBXSM=
16072if test "${HAVE_X11}" = "yes"; then 16084if test "${HAVE_X11}" = "yes"; then
16073 if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then 16085 if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then
16074 { $as_echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5 16086 { $as_echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5
@@ -16277,13 +16289,15 @@ cat >>confdefs.h <<\_ACEOF
16277#define HAVE_X_SM 1 16289#define HAVE_X_SM 1
16278_ACEOF 16290_ACEOF
16279 16291
16292 LIBXSM="-lSM -lICE"
16280 case "$LIBS" in 16293 case "$LIBS" in
16281 *-lSM*) ;; 16294 *-lSM*) ;;
16282 *) LIBS="-lSM -lICE $LIBS" ;; 16295 *) LIBS="$LIBXSM $LIBS" ;;
16283 esac 16296 esac
16284 fi 16297 fi
16285fi 16298fi
16286 16299
16300
16287# If netdb.h doesn't declare h_errno, we must declare it by hand. 16301# If netdb.h doesn't declare h_errno, we must declare it by hand.
16288{ $as_echo "$as_me:$LINENO: checking whether netdb declares h_errno" >&5 16302{ $as_echo "$as_me:$LINENO: checking whether netdb declares h_errno" >&5
16289$as_echo_n "checking whether netdb declares h_errno... " >&6; } 16303$as_echo_n "checking whether netdb declares h_errno... " >&6; }
@@ -25885,13 +25899,20 @@ cat >>confdefs.h <<_ACEOF
25885_ACEOF 25899_ACEOF
25886 25900
25887 25901
25902XMENU_OBJ=
25903XOBJ=
25888if test "${HAVE_X_WINDOWS}" = "yes" ; then 25904if test "${HAVE_X_WINDOWS}" = "yes" ; then
25889 25905
25890cat >>confdefs.h <<\_ACEOF 25906cat >>confdefs.h <<\_ACEOF
25891#define HAVE_X_WINDOWS 1 25907#define HAVE_X_WINDOWS 1
25892_ACEOF 25908_ACEOF
25893 25909
25910 XMENU_OBJ=xmenu.o
25911 XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o"
25894fi 25912fi
25913
25914
25915
25895if test "${USE_X_TOOLKIT}" != "none" ; then 25916if test "${USE_X_TOOLKIT}" != "none" ; then
25896 25917
25897cat >>confdefs.h <<\_ACEOF 25918cat >>confdefs.h <<\_ACEOF
@@ -27340,7 +27361,7 @@ echo creating src/Makefile
27340 mv -f Makefile.new Makefile 27361 mv -f Makefile.new Makefile
27341) 27362)
27342 27363
27343if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then 27364if ! test -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
27344 echo creating src/.gdbinit 27365 echo creating src/.gdbinit
27345 echo source $srcdir/src/.gdbinit > src/.gdbinit 27366 echo source $srcdir/src/.gdbinit > src/.gdbinit
27346fi 27367fi
diff --git a/configure.in b/configure.in
index 2da492f4e80..aaccdbfa2a9 100644
--- a/configure.in
+++ b/configure.in
@@ -3232,7 +3232,7 @@ echo creating src/Makefile
3232 mv -f Makefile.new Makefile 3232 mv -f Makefile.new Makefile
3233) 3233)
3234 3234
3235if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then 3235if ! test -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
3236 echo creating src/.gdbinit 3236 echo creating src/.gdbinit
3237 echo source $srcdir/src/.gdbinit > src/.gdbinit 3237 echo source $srcdir/src/.gdbinit > src/.gdbinit
3238fi 3238fi