Mercurial > emacs
comparison configure @ 108556:0ab790b153aa
Regenerate configure, src/config.in.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 13 May 2010 20:17:27 -0700 |
parents | 7ed2fb419f40 |
children | 58b814d12797 |
comparison
equal
deleted
inserted
replaced
108555:c3df6042f1d6 | 108556:0ab790b153aa |
---|---|
715 CFLAGS_SOUND | 715 CFLAGS_SOUND |
716 SET_MAKE | 716 SET_MAKE |
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_OBJ | 721 NS_OBJ |
721 NS_SUPPORT | 722 NS_SUPPORT |
722 LIB_STANDARD | 723 LIB_STANDARD |
723 HAVE_XSERVER | 724 HAVE_XSERVER |
724 RSVG_CFLAGS | 725 RSVG_CFLAGS |
749 LIBJPEG | 750 LIBJPEG |
750 LIBPNG | 751 LIBPNG |
751 LIBTIFF | 752 LIBTIFF |
752 LIBGIF | 753 LIBGIF |
753 LIBGPM | 754 LIBGPM |
754 GPM_MOUSE_SUPPORT | |
755 LIBXSM | 755 LIBXSM |
756 ALLOCA | 756 ALLOCA |
757 liblockfile | 757 liblockfile |
758 LIBS_MAIL | 758 LIBS_MAIL |
759 BLESSMAIL_TARGET | 759 BLESSMAIL_TARGET |
794 opsysfile | 794 opsysfile |
795 ns_appdir | 795 ns_appdir |
796 ns_appbindir | 796 ns_appbindir |
797 ns_appresdir | 797 ns_appresdir |
798 ns_appsrc | 798 ns_appsrc |
799 GNUSTEP_MAKEFILES | |
800 GNUSTEP_SYSTEM_HEADERS | 799 GNUSTEP_SYSTEM_HEADERS |
801 GNUSTEP_SYSTEM_LIBRARIES | 800 GNUSTEP_SYSTEM_LIBRARIES |
802 GNU_OBJC_CFLAGS | 801 GNU_OBJC_CFLAGS |
803 OTHER_FILES | 802 OTHER_FILES |
804 XMENU_OBJ | 803 XMENU_OBJ |
813 PRE_ALLOC_OBJ | 812 PRE_ALLOC_OBJ |
814 POST_ALLOC_OBJ | 813 POST_ALLOC_OBJ |
815 LD_SWITCH_SYSTEM_TEMACS | 814 LD_SWITCH_SYSTEM_TEMACS |
816 LD_SWITCH_SYSTEM_EXTRA | 815 LD_SWITCH_SYSTEM_EXTRA |
817 LIB_GCC | 816 LIB_GCC |
817 MOUSE_SUPPORT | |
818 TOOLTIP_SUPPORT | |
819 WINDOW_SUPPORT | |
818 LTLIBOBJS' | 820 LTLIBOBJS' |
819 ac_subst_files='' | 821 ac_subst_files='' |
820 ac_user_opts=' | 822 ac_user_opts=' |
821 enable_option_checking | 823 enable_option_checking |
822 with_pop | 824 with_pop |
9927 fi | 9929 fi |
9928 | 9930 |
9929 HAVE_NS=no | 9931 HAVE_NS=no |
9930 NS_IMPL_COCOA=no | 9932 NS_IMPL_COCOA=no |
9931 NS_IMPL_GNUSTEP=no | 9933 NS_IMPL_GNUSTEP=no |
9934 NS_IMPL_GNUSTEP_INC= | |
9932 tmp_CPPFLAGS="$CPPFLAGS" | 9935 tmp_CPPFLAGS="$CPPFLAGS" |
9933 tmp_CFLAGS="$CFLAGS" | 9936 tmp_CFLAGS="$CFLAGS" |
9934 CPPFLAGS="$CPPFLAGS -x objective-c" | 9937 CPPFLAGS="$CPPFLAGS -x objective-c" |
9935 CFLAGS="$CFLAGS -x objective-c" | 9938 CFLAGS="$CFLAGS -x objective-c" |
9936 if test "${with_ns}" != no; then | 9939 if test "${with_ns}" != no; then |
9947 ns_appresdir=`pwd`/nextstep/Emacs.app/Resources | 9950 ns_appresdir=`pwd`/nextstep/Emacs.app/Resources |
9948 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base | 9951 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base |
9949 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" | 9952 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" |
9950 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" | 9953 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" |
9951 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" | 9954 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" |
9955 ## Pull in stuff from GNUstep-make. | |
9956 NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu | |
9957 GUI_LIB=gnu | |
9958 include $GNUSTEP_MAKEFILES/Additional/base.make | |
9959 include $GNUSTEP_MAKEFILES/Additional/gui.make | |
9960 shared=no | |
9961 " | |
9952 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 9962 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
9953 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 9963 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
9954 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 9964 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
9955 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" | 9965 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" |
9956 LIB_STANDARD= | 9966 LIB_STANDARD= |
10138 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 10148 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
10139 if test $ns_have_nsinteger = no; then | 10149 if test $ns_have_nsinteger = no; then |
10140 NS_HAVE_NSINTEGER=no | 10150 NS_HAVE_NSINTEGER=no |
10141 fi | 10151 fi |
10142 fi | 10152 fi |
10153 | |
10143 | 10154 |
10144 NS_OBJ= | 10155 NS_OBJ= |
10145 NS_SUPPORT= | 10156 NS_SUPPORT= |
10146 if test "${HAVE_NS}" = yes; then | 10157 if test "${HAVE_NS}" = yes; then |
10147 window_system=nextstep | 10158 window_system=nextstep |
15989 fi | 16000 fi |
15990 | 16001 |
15991 ### Use -lgpm if available, unless `--with-gpm=no'. | 16002 ### Use -lgpm if available, unless `--with-gpm=no'. |
15992 HAVE_GPM=no | 16003 HAVE_GPM=no |
15993 LIBGPM= | 16004 LIBGPM= |
15994 GPM_MOUSE_SUPPORT= | 16005 MOUSE_SUPPORT= |
15995 if test "${with_gpm}" != "no"; then | 16006 if test "${with_gpm}" != "no"; then |
15996 if test "${ac_cv_header_gpm_h+set}" = set; then | 16007 if test "${ac_cv_header_gpm_h+set}" = set; then |
15997 { $as_echo "$as_me:$LINENO: checking for gpm.h" >&5 | 16008 { $as_echo "$as_me:$LINENO: checking for gpm.h" >&5 |
15998 $as_echo_n "checking for gpm.h... " >&6; } | 16009 $as_echo_n "checking for gpm.h... " >&6; } |
15999 if test "${ac_cv_header_gpm_h+set}" = set; then | 16010 if test "${ac_cv_header_gpm_h+set}" = set; then |
16199 cat >>confdefs.h <<\_ACEOF | 16210 cat >>confdefs.h <<\_ACEOF |
16200 #define HAVE_GPM 1 | 16211 #define HAVE_GPM 1 |
16201 _ACEOF | 16212 _ACEOF |
16202 | 16213 |
16203 LIBGPM=-lgpm | 16214 LIBGPM=-lgpm |
16204 GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc" | 16215 ## May be reset below. |
16216 MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)" | |
16205 fi | 16217 fi |
16206 fi | 16218 fi |
16207 | |
16208 | 16219 |
16209 | 16220 |
16210 if test "${ac_cv_header_malloc_malloc_h+set}" = set; then | 16221 if test "${ac_cv_header_malloc_malloc_h+set}" = set; then |
16211 { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 | 16222 { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 |
16212 $as_echo_n "checking for malloc/malloc.h... " >&6; } | 16223 $as_echo_n "checking for malloc/malloc.h... " >&6; } |
26355 | 26366 |
26356 | 26367 |
26357 | 26368 |
26358 | 26369 |
26359 | 26370 |
26360 | |
26361 cat >>confdefs.h <<_ACEOF | 26371 cat >>confdefs.h <<_ACEOF |
26362 #define EMACS_CONFIGURATION "${canonical}" | 26372 #define EMACS_CONFIGURATION "${canonical}" |
26363 _ACEOF | 26373 _ACEOF |
26364 | 26374 |
26365 | 26375 |
26585 | 26595 |
26586 ## Ask GCC where to find libgcc.a. | 26596 ## Ask GCC where to find libgcc.a. |
26587 *) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;; | 26597 *) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;; |
26588 esac | 26598 esac |
26589 fi | 26599 fi |
26600 | |
26601 | |
26602 TOOLTIP_SUPPORT= | |
26603 WINDOW_SUPPORT= | |
26604 ## If we're using X11/GNUstep, define some consequences. | |
26605 if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then | |
26606 | |
26607 cat >>confdefs.h <<\_ACEOF | |
26608 #define HAVE_WINDOW_SYSTEM 1 | |
26609 _ACEOF | |
26610 | |
26611 | |
26612 cat >>confdefs.h <<\_ACEOF | |
26613 #define HAVE_MOUSE 1 | |
26614 _ACEOF | |
26615 | |
26616 MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" | |
26617 TOOLTIP_SUPPORT="\${lispsource}mouse.elc" | |
26618 | |
26619 WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" | |
26620 test "$HAVE_X_WINDOWS" = "yes" && \ | |
26621 WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" | |
26622 | |
26623 fi | |
26624 | |
26625 | |
26626 | |
26590 | 26627 |
26591 | 26628 |
26592 | 26629 |
26593 | 26630 |
26594 | 26631 |