Mercurial > emacs
changeset 108028:3d3f9bad5460
configure.in: Change "if test ! -f" to "if ! test -f", regenerate configure.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 21 Apr 2010 18:42:39 +0200 |
| parents | 2ba5d029fd5e (current diff) 1c3b0c4f71d9 (diff) |
| children | e61497621f0d |
| files | |
| diffstat | 3 files changed, 29 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 21 18:26:09 2010 +0200 +++ b/ChangeLog Wed Apr 21 18:42:39 2010 +0200 @@ -1,3 +1,7 @@ +2010-04-21 Jan Djärv <jan.h.d@swipnet.se> + + * configure.in: Change "if test ! -f" to "if ! test -f". + 2010-04-21 Glenn Morris <rgm@gnu.org> * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
--- a/configure Wed Apr 21 18:26:09 2010 +0200 +++ b/configure Wed Apr 21 18:42:39 2010 +0200 @@ -714,8 +714,10 @@ RSVG_LIBS GTK_CFLAGS GTK_LIBS +GTK_OBJ DBUS_CFLAGS DBUS_LIBS +DBUS_OBJ GCONF_CFLAGS GCONF_LIBS LIBSELINUX_LIBS @@ -735,6 +737,7 @@ LIBTIFF LIBGIF LIBGPM +LIBXSM ALLOCA liblockfile LIBS_MAIL @@ -782,6 +785,8 @@ GNU_OBJC_CFLAGS LIB_SRC_EXTRA_INSTALLABLES OTHER_FILES +XMENU_OBJ +XOBJ LTLIBOBJS' ac_subst_files='' ac_user_opts=' @@ -11578,6 +11583,7 @@ fi +GTK_OBJ= if test x"$pkg_check_gtk" = xyes; then @@ -11699,6 +11705,7 @@ #define USE_GTK 1 _ACEOF + GTK_OBJ=gtkutil.o USE_X_TOOLKIT=none if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then : @@ -11718,6 +11725,7 @@ fi + if test "${HAVE_GTK}" = "yes"; then if test "$with_toolkit_scroll_bars" != no; then @@ -12409,6 +12417,7 @@ fi HAVE_DBUS=no +DBUS_OBJ= if test "${with_dbus}" = "yes"; then succeeded=no @@ -12611,9 +12620,11 @@ fi done + DBUS_OBJ=dbusbind.o fi fi + HAVE_GCONF=no if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then @@ -16069,6 +16080,7 @@ ### Use session management (-lSM -lICE) if available HAVE_X_SM=no +LIBXSM= if test "${HAVE_X11}" = "yes"; then if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5 @@ -16277,13 +16289,15 @@ #define HAVE_X_SM 1 _ACEOF + LIBXSM="-lSM -lICE" case "$LIBS" in *-lSM*) ;; - *) LIBS="-lSM -lICE $LIBS" ;; + *) LIBS="$LIBXSM $LIBS" ;; esac fi fi + # If netdb.h doesn't declare h_errno, we must declare it by hand. { $as_echo "$as_me:$LINENO: checking whether netdb declares h_errno" >&5 $as_echo_n "checking whether netdb declares h_errno... " >&6; } @@ -25885,13 +25899,20 @@ _ACEOF +XMENU_OBJ= +XOBJ= if test "${HAVE_X_WINDOWS}" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define HAVE_X_WINDOWS 1 _ACEOF -fi + XMENU_OBJ=xmenu.o + XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o" +fi + + + if test "${USE_X_TOOLKIT}" != "none" ; then cat >>confdefs.h <<\_ACEOF @@ -27340,7 +27361,7 @@ mv -f Makefile.new Makefile ) -if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then +if ! test -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then echo creating src/.gdbinit echo source $srcdir/src/.gdbinit > src/.gdbinit fi
--- a/configure.in Wed Apr 21 18:26:09 2010 +0200 +++ b/configure.in Wed Apr 21 18:42:39 2010 +0200 @@ -3232,7 +3232,7 @@ mv -f Makefile.new Makefile ) -if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then +if ! test -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then echo creating src/.gdbinit echo source $srcdir/src/.gdbinit > src/.gdbinit fi