Mercurial > emacs

comparison configure @ 108683:f4ea12190bdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 17 May 2010 22:44:26 +0000
parents a53949523193
children 08c1b90a24ee
comparison
equal deleted inserted replaced
108682:4e87133f8f2c 108683:f4ea12190bdf
717 XMKMF 717 XMKMF
718 LD_SWITCH_X_SITE_AUX 718 LD_SWITCH_X_SITE_AUX
719 LD_SWITCH_X_SITE_AUX_RPATH 719 LD_SWITCH_X_SITE_AUX_RPATH
720 NS_IMPL_GNUSTEP_INC 720 NS_IMPL_GNUSTEP_INC
721 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS 721 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
722 TEMACS_LDFLAGS2
722 NS_OBJ 723 NS_OBJ
723 NS_SUPPORT 724 NS_SUPPORT
724 LIB_STANDARD 725 LIB_STANDARD
725 HAVE_XSERVER 726 HAVE_XSERVER
726 RSVG_CFLAGS 727 RSVG_CFLAGS
806 LIBXT_OTHER 807 LIBXT_OTHER
807 OLDXMENU_TARGET 808 OLDXMENU_TARGET
808 OLDXMENU 809 OLDXMENU
809 LIBXMENU 810 LIBXMENU
810 LIBX_OTHER 811 LIBX_OTHER
812 OLDXMENU_DEPS
811 CYGWIN_OBJ 813 CYGWIN_OBJ
812 PRE_ALLOC_OBJ 814 PRE_ALLOC_OBJ
813 POST_ALLOC_OBJ 815 POST_ALLOC_OBJ
814 LD_SWITCH_SYSTEM_TEMACS 816 LD_SWITCH_SYSTEM_TEMACS
815 LD_SWITCH_SYSTEM_EXTRA 817 LD_SWITCH_SYSTEM_EXTRA
9935 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= 9937 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
9936 tmp_CPPFLAGS="$CPPFLAGS" 9938 tmp_CPPFLAGS="$CPPFLAGS"
9937 tmp_CFLAGS="$CFLAGS" 9939 tmp_CFLAGS="$CFLAGS"
9938 CPPFLAGS="$CPPFLAGS -x objective-c" 9940 CPPFLAGS="$CPPFLAGS -x objective-c"
9939 CFLAGS="$CFLAGS -x objective-c" 9941 CFLAGS="$CFLAGS -x objective-c"
9942 TEMACS_LDFLAGS2="\${LDFLAGS}"
9940 if test "${with_ns}" != no; then 9943 if test "${with_ns}" != no; then
9941 if test "${opsys}" = darwin; then 9944 if test "${opsys}" = darwin; then
9942 NS_IMPL_COCOA=yes 9945 NS_IMPL_COCOA=yes
9943 ns_appdir=`pwd`/nextstep/Emacs.app 9946 ns_appdir=`pwd`/nextstep/Emacs.app/
9944 ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS 9947 ns_appbindir=${ns_appdir}Contents/MacOS/
9945 ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources 9948 ns_appresdir=${ns_appdir}Contents/Resources
9946 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base 9949 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
9947 elif test -f $GNUSTEP_CONFIG_FILE; then 9950 elif test -f $GNUSTEP_CONFIG_FILE; then
9948 NS_IMPL_GNUSTEP=yes 9951 NS_IMPL_GNUSTEP=yes
9949 ns_appdir=`pwd`/nextstep/Emacs.app 9952 ns_appdir=`pwd`/nextstep/Emacs.app/
9950 ns_appbindir=`pwd`/nextstep/Emacs.app 9953 ns_appbindir=${ns_appdir}
9951 ns_appresdir=`pwd`/nextstep/Emacs.app/Resources 9954 ns_appresdir=${ns_appdir}Resources
9952 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 9955 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
9953 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" 9956 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
9954 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" 9957 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
9955 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" 9958 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
9956 ## Pull in stuff from GNUstep-make. 9959 ## Pull in stuff from GNUstep-make.
9965 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 9968 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
9966 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 9969 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
9967 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" 9970 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
9968 LIB_STANDARD= 9971 LIB_STANDARD=
9969 START_FILES= 9972 START_FILES=
9973 TEMACS_LDFLAGS2=
9970 fi 9974 fi
9971 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then 9975 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then
9972 { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5 9976 { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5
9973 $as_echo_n "checking for AppKit/AppKit.h... " >&6; } 9977 $as_echo_n "checking for AppKit/AppKit.h... " >&6; }
9974 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then 9978 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then
10151 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 10155 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10152 if test $ns_have_nsinteger = no; then 10156 if test $ns_have_nsinteger = no; then
10153 NS_HAVE_NSINTEGER=no 10157 NS_HAVE_NSINTEGER=no
10154 fi 10158 fi
10155 fi 10159 fi
10160
10156 10161
10157 10162
10158 10163
10159 NS_OBJ= 10164 NS_OBJ=
10160 NS_SUPPORT= 10165 NS_SUPPORT=
26482 else 26487 else
26483 OLDXMENU="\${lwlibdir}liblw.a" 26488 OLDXMENU="\${lwlibdir}liblw.a"
26484 fi 26489 fi
26485 LIBXMENU="\$(OLDXMENU)" 26490 LIBXMENU="\$(OLDXMENU)"
26486 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" 26491 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
26492 OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}"
26487 else 26493 else
26488 OLDXMENU= 26494 OLDXMENU=
26489 ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). 26495 ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
26490 if test "${HAVE_X_WINDOWS}" = "yes"; then 26496 if test "${HAVE_X_WINDOWS}" = "yes"; then
26491 LIBXMENU="-lXMenu" 26497 LIBXMENU="-lXMenu"
26492 else 26498 else
26493 LIBXMENU= 26499 LIBXMENU=
26494 fi 26500 fi
26495 LIBX_OTHER= 26501 LIBX_OTHER=
26502 OLDXMENU_DEPS=
26496 fi 26503 fi
26497 26504
26498 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then 26505 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
26499 OLDXMENU= 26506 OLDXMENU=
26500 LIBXMENU= 26507 LIBXMENU=
26501 fi 26508 OLDXMENU_DEPS=
26509 fi
26510
26502 26511
26503 26512
26504 26513
26505 26514
26506 26515