Mercurial > emacs

comparison configure @ 108848:10ebbc5247aa

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 Wed, 26 May 2010 22:43:08 +0000
parents 939ecb6ccd4d
children dedcf813aa69
comparison
equal deleted inserted replaced
108847:3e401eb6d5ee 108848:10ebbc5247aa
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
818 RALLOC_OBJ 816 RALLOC_OBJ
819 CYGWIN_OBJ 817 CYGWIN_OBJ
820 PRE_ALLOC_OBJ 818 PRE_ALLOC_OBJ
821 POST_ALLOC_OBJ 819 POST_ALLOC_OBJ
822 LD_SWITCH_SYSTEM_TEMACS 820 LD_SWITCH_SYSTEM_TEMACS
823 YMF_PASS_LDFLAGS 821 PRE_EDIT_LDFLAGS
822 POST_EDIT_LDFLAGS
824 LINKER 823 LINKER
825 LIB_GCC 824 LIB_GCC
826 MOUSE_SUPPORT 825 MOUSE_SUPPORT
827 TOOLTIP_SUPPORT 826 TOOLTIP_SUPPORT
828 WINDOW_SUPPORT 827 WINDOW_SUPPORT
9933 fi 9932 fi
9934 9933
9935 HAVE_NS=no 9934 HAVE_NS=no
9936 NS_IMPL_COCOA=no 9935 NS_IMPL_COCOA=no
9937 NS_IMPL_GNUSTEP=no 9936 NS_IMPL_GNUSTEP=no
9938 NS_IMPL_GNUSTEP_INC=
9939 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
9940 tmp_CPPFLAGS="$CPPFLAGS" 9937 tmp_CPPFLAGS="$CPPFLAGS"
9941 tmp_CFLAGS="$CFLAGS" 9938 tmp_CFLAGS="$CFLAGS"
9942 CPPFLAGS="$CPPFLAGS -x objective-c" 9939 CPPFLAGS="$CPPFLAGS -x objective-c"
9943 CFLAGS="$CFLAGS -x objective-c" 9940 CFLAGS="$CFLAGS -x objective-c"
9944 TEMACS_LDFLAGS2="\${LDFLAGS}" 9941 TEMACS_LDFLAGS2="\${LDFLAGS}"
9953 NS_IMPL_GNUSTEP=yes 9950 NS_IMPL_GNUSTEP=yes
9954 ns_appdir=`pwd`/nextstep/Emacs.app/ 9951 ns_appdir=`pwd`/nextstep/Emacs.app/
9955 ns_appbindir=${ns_appdir} 9952 ns_appbindir=${ns_appdir}
9956 ns_appresdir=${ns_appdir}Resources 9953 ns_appresdir=${ns_appdir}Resources
9957 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 9954 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
9958 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" 9955 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)" 9956 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
9961 ## Pull in stuff from GNUstep-make. 9957 GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
9962 ## FIXME? Cleaner to use AC_SUBST_FILE for this? 9958 GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
9963 NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu 9959 test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
9964 GUI_LIB=gnu 9960 GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
9965 include $GNUSTEP_MAKEFILES/Additional/base.make 9961 test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
9966 include $GNUSTEP_MAKEFILES/Additional/gui.make 9962 GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
9967 shared=no 9963 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
9968 " 9964 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" 9965 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
9970 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 9966 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= 9967 LIB_STANDARD=
9975 START_FILES= 9968 START_FILES=
9976 TEMACS_LDFLAGS2= 9969 TEMACS_LDFLAGS2=
9977 fi 9970 fi
9978 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then 9971 if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then
10158 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 10151 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10159 if test $ns_have_nsinteger = no; then 10152 if test $ns_have_nsinteger = no; then
10160 NS_HAVE_NSINTEGER=no 10153 NS_HAVE_NSINTEGER=no
10161 fi 10154 fi
10162 fi 10155 fi
10163
10164
10165 10156
10166 10157
10167 ns_frag=/dev/null 10158 ns_frag=/dev/null
10168 NS_OBJ= 10159 NS_OBJ=
10169 NS_SUPPORT= 10160 NS_SUPPORT=
26632 gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;; 26623 gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;;
26633 26624
26634 *) LD_SWITCH_SYSTEM_TEMACS= ;; 26625 *) LD_SWITCH_SYSTEM_TEMACS= ;;
26635 esac 26626 esac
26636 26627
26628 if test "$NS_IMPL_GNUSTEP" = "yes"; then
26629 LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
26630 fi
26631
26632
26637 26633
26638 26634
26639 LINKER= 26635 LINKER=
26640 ORDINARY_LINK= 26636 ORDINARY_LINK=
26641 case "$opsys" in 26637 case "$opsys" in
26658 macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;; 26654 macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;;
26659 esac 26655 esac
26660 ;; 26656 ;;
26661 esac 26657 esac
26662 26658
26663 ## A macro which other sections of Makefile can redefine to munge the 26659
26664 ## flags before they are passed to LD. This is helpful if you have 26660 PRE_EDIT_LDFLAGS=
26665 ## redefined LD to something odd, like "gcc". 26661 POST_EDIT_LDFLAGS=
26666 ## (The YMF prefix is a holdover from the old name "ymakefile".)
26667 YMF_PASS_LDFLAGS=flags
26668 if test "x$ORDINARY_LINK" = "xyes"; then 26662 if test "x$ORDINARY_LINK" = "xyes"; then
26669 26663
26670 LINKER="\$(CC)" 26664 LINKER="\$(CC)"
26671 26665
26672 cat >>confdefs.h <<\_ACEOF 26666 cat >>confdefs.h <<\_ACEOF
26690 ## GCC passes any argument prefixed with -Xlinker directly to the linker. 26684 ## GCC passes any argument prefixed with -Xlinker directly to the linker.
26691 ## See prefix-args.c for an explanation of why we do not do this with the 26685 ## See prefix-args.c for an explanation of why we do not do this with the
26692 ## shell''s ``for'' construct. Note that sane people do not have '.' in 26686 ## shell''s ``for'' construct. Note that sane people do not have '.' in
26693 ## their paths, so we must use ./prefix-args. 26687 ## their paths, so we must use ./prefix-args.
26694 ## TODO either make prefix-args check ORDINARY_LINK internally, 26688 ## TODO either make prefix-args check ORDINARY_LINK internally,
26695 ## or remove it altogether (bug#6184), removing the need for this macro. 26689 ## or remove it altogether (bug#6184), removing the need for this hack.
26696 YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' 26690 PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
26697 fi 26691 POST_EDIT_LDFLAGS='`'
26692 fi
26693
26698 26694
26699 26695
26700 test "x$LINKER" = "x" && LINKER=ld 26696 test "x$LINKER" = "x" && LINKER=ld
26701 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? 26697 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have?
26702 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" 26698 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"