diff options
| author | Jan Djärv | 2010-04-21 18:41:29 +0200 |
|---|---|---|
| committer | Jan Djärv | 2010-04-21 18:41:29 +0200 |
| commit | e765bf582cd4da0092f431536bc06aed78d5b762 (patch) | |
| tree | 19d9c51968be289f5cf8b9cea87a5bd2565a1d2e | |
| parent | 20fe03ad8549ef41bcd79a4a0c0d683b1df2318b (diff) | |
| download | emacs-e765bf582cd4da0092f431536bc06aed78d5b762.tar.gz emacs-e765bf582cd4da0092f431536bc06aed78d5b762.zip | |
configure.in: Change "if test ! -f" to "if ! test -f".
Regenerate configure.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 25 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 28 insertions, 3 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-04-21 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * configure.in: Change "if test ! -f" to "if ! test -f". | ||
| 4 | |||
| 1 | 2010-04-21 Glenn Morris <rgm@gnu.org> | 5 | 2010-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. |
| @@ -714,8 +714,10 @@ RSVG_CFLAGS | |||
| 714 | RSVG_LIBS | 714 | RSVG_LIBS |
| 715 | GTK_CFLAGS | 715 | GTK_CFLAGS |
| 716 | GTK_LIBS | 716 | GTK_LIBS |
| 717 | GTK_OBJ | ||
| 717 | DBUS_CFLAGS | 718 | DBUS_CFLAGS |
| 718 | DBUS_LIBS | 719 | DBUS_LIBS |
| 720 | DBUS_OBJ | ||
| 719 | GCONF_CFLAGS | 721 | GCONF_CFLAGS |
| 720 | GCONF_LIBS | 722 | GCONF_LIBS |
| 721 | LIBSELINUX_LIBS | 723 | LIBSELINUX_LIBS |
| @@ -735,6 +737,7 @@ LIBPNG | |||
| 735 | LIBTIFF | 737 | LIBTIFF |
| 736 | LIBGIF | 738 | LIBGIF |
| 737 | LIBGPM | 739 | LIBGPM |
| 740 | LIBXSM | ||
| 738 | ALLOCA | 741 | ALLOCA |
| 739 | liblockfile | 742 | liblockfile |
| 740 | LIBS_MAIL | 743 | LIBS_MAIL |
| @@ -782,6 +785,8 @@ GNUSTEP_SYSTEM_LIBRARIES | |||
| 782 | GNU_OBJC_CFLAGS | 785 | GNU_OBJC_CFLAGS |
| 783 | LIB_SRC_EXTRA_INSTALLABLES | 786 | LIB_SRC_EXTRA_INSTALLABLES |
| 784 | OTHER_FILES | 787 | OTHER_FILES |
| 788 | XMENU_OBJ | ||
| 789 | XOBJ | ||
| 785 | LTLIBOBJS' | 790 | LTLIBOBJS' |
| 786 | ac_subst_files='' | 791 | ac_subst_files='' |
| 787 | ac_user_opts=' | 792 | ac_user_opts=' |
| @@ -11578,6 +11583,7 @@ $as_echo "$as_me: error: $GTK_PKG_ERRORS" >&2;} | |||
| 11578 | fi | 11583 | fi |
| 11579 | 11584 | ||
| 11580 | 11585 | ||
| 11586 | GTK_OBJ= | ||
| 11581 | if test x"$pkg_check_gtk" = xyes; then | 11587 | if 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 | |||
| 11718 | fi | 11725 | fi |
| 11719 | 11726 | ||
| 11720 | 11727 | ||
| 11728 | |||
| 11721 | if test "${HAVE_GTK}" = "yes"; then | 11729 | if 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 | |||
| 12409 | fi | 12417 | fi |
| 12410 | 12418 | ||
| 12411 | HAVE_DBUS=no | 12419 | HAVE_DBUS=no |
| 12420 | DBUS_OBJ= | ||
| 12412 | if test "${with_dbus}" = "yes"; then | 12421 | if test "${with_dbus}" = "yes"; then |
| 12413 | 12422 | ||
| 12414 | succeeded=no | 12423 | succeeded=no |
| @@ -12611,9 +12620,11 @@ _ACEOF | |||
| 12611 | fi | 12620 | fi |
| 12612 | done | 12621 | done |
| 12613 | 12622 | ||
| 12623 | DBUS_OBJ=dbusbind.o | ||
| 12614 | fi | 12624 | fi |
| 12615 | fi | 12625 | fi |
| 12616 | 12626 | ||
| 12627 | |||
| 12617 | HAVE_GCONF=no | 12628 | HAVE_GCONF=no |
| 12618 | if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then | 12629 | if 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 |
| 16071 | HAVE_X_SM=no | 16082 | HAVE_X_SM=no |
| 16083 | LIBXSM= | ||
| 16072 | if test "${HAVE_X11}" = "yes"; then | 16084 | if 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 |
| 16285 | fi | 16298 | fi |
| 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 | ||
| 25902 | XMENU_OBJ= | ||
| 25903 | XOBJ= | ||
| 25888 | if test "${HAVE_X_WINDOWS}" = "yes" ; then | 25904 | if test "${HAVE_X_WINDOWS}" = "yes" ; then |
| 25889 | 25905 | ||
| 25890 | cat >>confdefs.h <<\_ACEOF | 25906 | cat >>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" | ||
| 25894 | fi | 25912 | fi |
| 25913 | |||
| 25914 | |||
| 25915 | |||
| 25895 | if test "${USE_X_TOOLKIT}" != "none" ; then | 25916 | if test "${USE_X_TOOLKIT}" != "none" ; then |
| 25896 | 25917 | ||
| 25897 | cat >>confdefs.h <<\_ACEOF | 25918 | cat >>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 | ||
| 27343 | if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then | 27364 | if ! 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 |
| 27346 | fi | 27367 | fi |
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 | ||
| 3235 | if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then | 3235 | if ! 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 |
| 3238 | fi | 3238 | fi |