Mercurial > emacs

comparison configure @ 108026:1c3b0c4f71d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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:41:29 +0200
parents f3c91f3abae4
children 8ff86e76b50f
comparison
equal deleted inserted replaced
108025:7b45a10725ef 108026:1c3b0c4f71d9
712 HAVE_XSERVER 712 HAVE_XSERVER
713 RSVG_CFLAGS 713 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
722 FONTCONFIG_CFLAGS 724 FONTCONFIG_CFLAGS
723 FONTCONFIG_LIBS 725 FONTCONFIG_LIBS
733 LIBJPEG 735 LIBJPEG
734 LIBPNG 736 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
741 LIBOBJS 744 LIBOBJS
742 NEED_SETGID 745 NEED_SETGID
780 GNUSTEP_SYSTEM_HEADERS 783 GNUSTEP_SYSTEM_HEADERS
781 GNUSTEP_SYSTEM_LIBRARIES 784 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='
788 enable_option_checking 793 enable_option_checking
789 with_pop 794 with_pop
11576 { (exit 1); exit 1; }; } 11581 { (exit 1); exit 1; }; }
11577 fi 11582 fi
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
11584 11590
11585 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS" 11591 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
11697 11703
11698 cat >>confdefs.h <<\_ACEOF 11704 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 :
11705 else 11712 else
11706 { $as_echo "$as_me:$LINENO: WARNING: Your version of Gtk+ will have problems with 11713 { $as_echo "$as_me:$LINENO: WARNING: Your version of Gtk+ will have problems with
11714 sleep 3 11721 sleep 3
11715 fi 11722 fi
11716 fi 11723 fi
11717 11724
11718 fi 11725 fi
11726
11719 11727
11720 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
12407 fi 12415 fi
12408 fi 12416 fi
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
12415 12424
12416 # Extract the first word of "pkg-config", so it can be a program name with args. 12425 # Extract the first word of "pkg-config", so it can be a program name with args.
12609 _ACEOF 12618 _ACEOF
12610 12619
12611 fi 12620 fi
12612 done 12621 done
12613 12622
12623 DBUS_OBJ=dbusbind.o
12614 fi 12624 fi
12615 fi 12625 fi
12626
12616 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
12620 succeeded=no 12631 succeeded=no
16067 fi 16078 fi
16068 16079
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
16075 $as_echo_n "checking for X11/SM/SMlib.h... " >&6; } 16087 $as_echo_n "checking for X11/SM/SMlib.h... " >&6; }
16076 if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then 16088 if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then
16275 16287
16276 cat >>confdefs.h <<\_ACEOF 16288 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
16299
16286 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; }
16290 if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then 16304 if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then
25883 cat >>confdefs.h <<_ACEOF 25897 cat >>confdefs.h <<_ACEOF
25884 #define UNEXEC_SRC ${UNEXEC_SRC} 25898 #define UNEXEC_SRC ${UNEXEC_SRC}
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
25894 fi 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"
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
25898 #define USE_X_TOOLKIT 1 25919 #define USE_X_TOOLKIT 1
25899 _ACEOF 25920 _ACEOF
27339 rm -f junk.c junk1.c junk2.c 27360 rm -f junk.c junk1.c junk2.c
27340 chmod 444 Makefile.new 27361 chmod 444 Makefile.new
27341 mv -f Makefile.new Makefile 27362 mv -f Makefile.new Makefile
27342 ) 27363 )
27343 27364
27344 if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then 27365 if ! test -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
27345 echo creating src/.gdbinit 27366 echo creating src/.gdbinit
27346 echo source $srcdir/src/.gdbinit > src/.gdbinit 27367 echo source $srcdir/src/.gdbinit > src/.gdbinit
27347 fi 27368 fi
27348 27369
27349 ;; 27370 ;;