Mercurial > emacs

comparison configure @ 108789:b77dfb08cff8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Regenerate configure.
author Glenn Morris <rgm@gnu.org>
date Tue, 25 May 2010 20:53:25 -0700
parents f6d1128c9985
children 1b3be6d705bd
comparison
equal deleted inserted replaced
108788:17428e70b5d9 108789:b77dfb08cff8
718 MKDEPDIR 718 MKDEPDIR
719 DEPFLAGS 719 DEPFLAGS
720 XMKMF 720 XMKMF
721 LD_SWITCH_X_SITE_AUX 721 LD_SWITCH_X_SITE_AUX
722 LD_SWITCH_X_SITE_AUX_RPATH 722 LD_SWITCH_X_SITE_AUX_RPATH
723 NS_IMPL_GNUSTEP_INC
724 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
725 TEMACS_LDFLAGS2 723 TEMACS_LDFLAGS2
726 NS_OBJ 724 NS_OBJ
727 NS_SUPPORT 725 NS_SUPPORT
728 LIB_STANDARD 726 LIB_STANDARD
729 HAVE_XSERVER 727 HAVE_XSERVER
9933 fi 9931 fi
9934 9932
9935 HAVE_NS=no 9933 HAVE_NS=no
9936 NS_IMPL_COCOA=no 9934 NS_IMPL_COCOA=no
9937 NS_IMPL_GNUSTEP=no 9935 NS_IMPL_GNUSTEP=no
9938 NS_IMPL_GNUSTEP_INC=
9939 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
9940 tmp_CPPFLAGS="$CPPFLAGS" 9936 tmp_CPPFLAGS="$CPPFLAGS"
9941 tmp_CFLAGS="$CFLAGS" 9937 tmp_CFLAGS="$CFLAGS"
9942 CPPFLAGS="$CPPFLAGS -x objective-c" 9938 CPPFLAGS="$CPPFLAGS -x objective-c"
9943 CFLAGS="$CFLAGS -x objective-c" 9939 CFLAGS="$CFLAGS -x objective-c"
9944 TEMACS_LDFLAGS2="\${LDFLAGS}" 9940 TEMACS_LDFLAGS2="\${LDFLAGS}"
9953 NS_IMPL_GNUSTEP=yes 9949 NS_IMPL_GNUSTEP=yes
9954 ns_appdir=`pwd`/nextstep/Emacs.app/ 9950 ns_appdir=`pwd`/nextstep/Emacs.app/
9955 ns_appbindir=${ns_appdir} 9951 ns_appbindir=${ns_appdir}
9956 ns_appresdir=${ns_appdir}Resources 9952 ns_appresdir=${ns_appdir}Resources
9957 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 9953 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
9958 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" 9954 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
9959 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
9960 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" 9955 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
9961 ## Pull in stuff from GNUstep-make. 9956 GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
9962 ## FIXME? Cleaner to use AC_SUBST_FILE for this? 9957 GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
9963 NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu 9958 test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
9964 GUI_LIB=gnu 9959 GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
9965 include $GNUSTEP_MAKEFILES/Additional/base.make 9960 test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
9966 include $GNUSTEP_MAKEFILES/Additional/gui.make 9961 GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
9967 shared=no 9962 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
9968 " 9963 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
9969 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" 9964 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
9970 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 9965 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
9971 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
9972 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
9973 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
9974 LIB_STANDARD= 9966 LIB_STANDARD=
9975 START_FILES= 9967 START_FILES=
9976 TEMACS_LDFLAGS2= 9968 TEMACS_LDFLAGS2=
9977 fi 9969 fi
9978 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then 9970 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then
10158 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 10150 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10159 if test $ns_have_nsinteger = no; then 10151 if test $ns_have_nsinteger = no; then
10160 NS_HAVE_NSINTEGER=no 10152 NS_HAVE_NSINTEGER=no
10161 fi 10153 fi
10162 fi 10154 fi
10163
10164
10165 10155
10166 10156
10167 ns_frag=/dev/null 10157 ns_frag=/dev/null
10168 NS_OBJ= 10158 NS_OBJ=
10169 NS_SUPPORT= 10159 NS_SUPPORT=
26631 ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. 26621 ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS.
26632 gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;; 26622 gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;;
26633 26623
26634 *) LD_SWITCH_SYSTEM_TEMACS= ;; 26624 *) LD_SWITCH_SYSTEM_TEMACS= ;;
26635 esac 26625 esac
26626
26627 if test "$NS_IMPL_GNUSTEP=yes"; then
26628 LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
26629 fi
26630
26636 26631
26637 26632
26638 26633
26639 LINKER= 26634 LINKER=
26640 ORDINARY_LINK= 26635 ORDINARY_LINK=