Mercurial > emacs
comparison configure.in @ 108682:4e87133f8f2c
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 16 May 2010 22:41:29 +0000 |
parents | 6b62ba6da320 |
children | ecb7cdb525f0 |
comparison
equal
deleted
inserted
replaced
108566:b7c1f69ad104 | 108682:4e87133f8f2c |
---|---|
1451 | 1451 |
1452 HAVE_NS=no | 1452 HAVE_NS=no |
1453 NS_IMPL_COCOA=no | 1453 NS_IMPL_COCOA=no |
1454 NS_IMPL_GNUSTEP=no | 1454 NS_IMPL_GNUSTEP=no |
1455 NS_IMPL_GNUSTEP_INC= | 1455 NS_IMPL_GNUSTEP_INC= |
1456 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= | |
1456 tmp_CPPFLAGS="$CPPFLAGS" | 1457 tmp_CPPFLAGS="$CPPFLAGS" |
1457 tmp_CFLAGS="$CFLAGS" | 1458 tmp_CFLAGS="$CFLAGS" |
1458 CPPFLAGS="$CPPFLAGS -x objective-c" | 1459 CPPFLAGS="$CPPFLAGS -x objective-c" |
1459 CFLAGS="$CFLAGS -x objective-c" | 1460 CFLAGS="$CFLAGS -x objective-c" |
1460 if test "${with_ns}" != no; then | 1461 if test "${with_ns}" != no; then |
1479 GUI_LIB=gnu | 1480 GUI_LIB=gnu |
1480 include $GNUSTEP_MAKEFILES/Additional/base.make | 1481 include $GNUSTEP_MAKEFILES/Additional/base.make |
1481 include $GNUSTEP_MAKEFILES/Additional/gui.make | 1482 include $GNUSTEP_MAKEFILES/Additional/gui.make |
1482 shared=no | 1483 shared=no |
1483 " | 1484 " |
1485 dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes. | |
1486 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" | |
1484 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1487 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
1485 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1488 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
1486 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1489 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
1487 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" | 1490 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" |
1488 LIB_STANDARD= | 1491 LIB_STANDARD= |
1492 START_FILES= | |
1489 fi | 1493 fi |
1490 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], | 1494 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], |
1491 [AC_MSG_ERROR([`--with-ns' was specified, but the include | 1495 [AC_MSG_ERROR([`--with-ns' was specified, but the include |
1492 files are missing or cannot be compiled.])]) | 1496 files are missing or cannot be compiled.])]) |
1493 NS_HAVE_NSINTEGER=yes | 1497 NS_HAVE_NSINTEGER=yes |
1498 if test $ns_have_nsinteger = no; then | 1502 if test $ns_have_nsinteger = no; then |
1499 NS_HAVE_NSINTEGER=no | 1503 NS_HAVE_NSINTEGER=no |
1500 fi | 1504 fi |
1501 fi | 1505 fi |
1502 AC_SUBST(NS_IMPL_GNUSTEP_INC) | 1506 AC_SUBST(NS_IMPL_GNUSTEP_INC) |
1507 AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) | |
1503 | 1508 |
1504 NS_OBJ= | 1509 NS_OBJ= |
1505 NS_SUPPORT= | 1510 NS_SUPPORT= |
1506 if test "${HAVE_NS}" = yes; then | 1511 if test "${HAVE_NS}" = yes; then |
1507 window_system=nextstep | 1512 window_system=nextstep |
2229 HAVE_FREETYPE=no | 2234 HAVE_FREETYPE=no |
2230 HAVE_LIBOTF=no | 2235 HAVE_LIBOTF=no |
2231 HAVE_M17N_FLT=no | 2236 HAVE_M17N_FLT=no |
2232 fi | 2237 fi |
2233 | 2238 |
2234 FONT_OBJ=xfont.o | |
2235 if test "$HAVE_XFT" = "yes"; then | |
2236 FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" | |
2237 elif test "$HAVE_FREETYPE" = "yes"; then | |
2238 FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o" | |
2239 fi | |
2240 AC_SUBST(FONT_OBJ) | |
2241 | |
2242 ### End of font-backend (under X11) section. | 2239 ### End of font-backend (under X11) section. |
2243 | 2240 |
2244 AC_SUBST(FREETYPE_CFLAGS) | 2241 AC_SUBST(FREETYPE_CFLAGS) |
2245 AC_SUBST(FREETYPE_LIBS) | 2242 AC_SUBST(FREETYPE_LIBS) |
2246 AC_SUBST(FONTCONFIG_CFLAGS) | 2243 AC_SUBST(FONTCONFIG_CFLAGS) |
2618 ## The above test has not necessarily found libncurses. | 2615 ## The above test has not necessarily found libncurses. |
2619 HAVE_LIBNCURSES=yes | 2616 HAVE_LIBNCURSES=yes |
2620 | 2617 |
2621 ## Use terminfo instead of termcap? | 2618 ## Use terminfo instead of termcap? |
2622 ## Note only system files NOT using terminfo are: | 2619 ## Note only system files NOT using terminfo are: |
2623 ## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and | 2620 ## freebsd < 40000, ms-w32, msdos, netbsd, and |
2624 ## darwin|gnu without ncurses. | 2621 ## darwin|gnu without ncurses. |
2625 TERMINFO=no | 2622 TERMINFO=no |
2626 LIBS_TERMCAP= | 2623 LIBS_TERMCAP= |
2627 case "$opsys" in | 2624 case "$opsys" in |
2628 ## cygwin: Fewer environment variables to go wrong, more terminal types. | 2625 ## cygwin: Fewer environment variables to go wrong, more terminal types. |
2629 ## hpux10-20: Use the system provided termcap(3) library. | 2626 ## hpux10-20: Use the system provided termcap(3) library. |
2630 ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this | 2627 ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this |
2631 ## is necessary. Otherwise Emacs dumps core when run -nw. | 2628 ## is necessary. Otherwise Emacs dumps core when run -nw. |
2632 aix4-2|cygwin|hpux*|irix6-5|openbsd|usg5-4|sol2*|unixware) TERMINFO=yes ;; | 2629 aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;; |
2633 | 2630 |
2634 ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. | 2631 ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. |
2635 ## The ncurses library has been moved out of the System framework in | 2632 ## The ncurses library has been moved out of the System framework in |
2636 ## Mac OS X 10.2. So if configure detects it, set the command-line | 2633 ## Mac OS X 10.2. So if configure detects it, set the command-line |
2637 ## option to use it. | 2634 ## option to use it. |
3006 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then | 3003 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then |
3007 AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.]) | 3004 AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.]) |
3008 fi | 3005 fi |
3009 | 3006 |
3010 #### Find out which version of Emacs this is. | 3007 #### Find out which version of Emacs this is. |
3011 [version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ | 3008 [version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \ |
3012 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`] | 3009 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`] |
3013 if test x"${version}" = x; then | 3010 if test x"${version}" = x; then |
3014 AC_MSG_ERROR([can't find current emacs version in `${srcdir}/lisp/version.el'.]) | 3011 AC_MSG_ERROR([can't find current emacs version in `${srcdir}/src/emacs.c'.]) |
3015 fi | 3012 fi |
3016 if test x"${version}" != x"$PACKAGE_VERSION"; then | 3013 if test x"${version}" != x"$PACKAGE_VERSION"; then |
3017 AC_MSG_WARN([version mismatch between `${srcdir}/configure.in' and `${srcdir}/lisp/version.el'.]) | 3014 AC_MSG_WARN([version mismatch between `${srcdir}/configure.in' and `${srcdir}/src/emacs.c'.]) |
3018 fi | 3015 fi |
3019 | 3016 |
3020 ### Specify what sort of things we'll be editing into Makefile and config.h. | 3017 ### Specify what sort of things we'll be editing into Makefile and config.h. |
3021 ### Use configuration here uncanonicalized to avoid exceeding size limits. | 3018 ### Use configuration here uncanonicalized to avoid exceeding size limits. |
3022 AC_SUBST(version) | 3019 AC_SUBST(version) |
3057 AC_SUBST(GETLOADAVG_LIBS) | 3054 AC_SUBST(GETLOADAVG_LIBS) |
3058 AC_SUBST(ns_appdir) | 3055 AC_SUBST(ns_appdir) |
3059 AC_SUBST(ns_appbindir) | 3056 AC_SUBST(ns_appbindir) |
3060 AC_SUBST(ns_appresdir) | 3057 AC_SUBST(ns_appresdir) |
3061 AC_SUBST(ns_appsrc) | 3058 AC_SUBST(ns_appsrc) |
3062 AC_SUBST(GNUSTEP_SYSTEM_HEADERS) | |
3063 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES) | |
3064 AC_SUBST(GNU_OBJC_CFLAGS) | 3059 AC_SUBST(GNU_OBJC_CFLAGS) |
3065 AC_SUBST(OTHER_FILES) | 3060 AC_SUBST(OTHER_FILES) |
3066 | 3061 |
3067 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", | 3062 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", |
3068 [Define to the canonical Emacs configuration name.]) | 3063 [Define to the canonical Emacs configuration name.]) |
3073 AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", | 3068 AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", |
3074 [Define to the used os dependent file.]) | 3069 [Define to the used os dependent file.]) |
3075 | 3070 |
3076 XMENU_OBJ= | 3071 XMENU_OBJ= |
3077 XOBJ= | 3072 XOBJ= |
3073 FONT_OBJ= | |
3078 if test "${HAVE_X_WINDOWS}" = "yes" ; then | 3074 if test "${HAVE_X_WINDOWS}" = "yes" ; then |
3079 AC_DEFINE(HAVE_X_WINDOWS, 1, | 3075 AC_DEFINE(HAVE_X_WINDOWS, 1, |
3080 [Define to 1 if you want to use the X window system.]) | 3076 [Define to 1 if you want to use the X window system.]) |
3081 XMENU_OBJ=xmenu.o | 3077 XMENU_OBJ=xmenu.o |
3082 XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o" | 3078 XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o" |
3079 FONT_OBJ=xfont.o | |
3080 if test "$HAVE_XFT" = "yes"; then | |
3081 FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" | |
3082 elif test "$HAVE_FREETYPE" = "yes"; then | |
3083 FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o" | |
3084 fi | |
3085 AC_SUBST(FONT_OBJ) | |
3083 fi | 3086 fi |
3084 AC_SUBST(XMENU_OBJ) | 3087 AC_SUBST(XMENU_OBJ) |
3085 AC_SUBST(XOBJ) | 3088 AC_SUBST(XOBJ) |
3089 AC_SUBST(FONT_OBJ) | |
3086 | 3090 |
3087 WIDGET_OBJ= | 3091 WIDGET_OBJ= |
3088 MOTIF_LIBW= | 3092 MOTIF_LIBW= |
3089 if test "${USE_X_TOOLKIT}" != "none" ; then | 3093 if test "${USE_X_TOOLKIT}" != "none" ; then |
3090 WIDGET_OBJ=widget.o | 3094 WIDGET_OBJ=widget.o |
3124 esac | 3128 esac |
3125 AC_SUBST(TOOLKIT_LIBW) | 3129 AC_SUBST(TOOLKIT_LIBW) |
3126 | 3130 |
3127 if test "$USE_X_TOOLKIT" = "none"; then | 3131 if test "$USE_X_TOOLKIT" = "none"; then |
3128 LIBXT_OTHER="\$(LIBXSM)" | 3132 LIBXT_OTHER="\$(LIBXSM)" |
3133 OLDXMENU_TARGET="really-oldXMenu" | |
3129 else | 3134 else |
3130 LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" | 3135 LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" |
3136 OLDXMENU_TARGET="really-lwlib" | |
3131 fi | 3137 fi |
3132 AC_SUBST(LIBXT_OTHER) | 3138 AC_SUBST(LIBXT_OTHER) |
3139 AC_SUBST(OLDXMENU_TARGET) | |
3133 | 3140 |
3134 ## The X Menu stuff is present in the X10 distribution, but missing | 3141 ## The X Menu stuff is present in the X10 distribution, but missing |
3135 ## from X11. If we have X10, just use the installed library; | 3142 ## from X11. If we have X10, just use the installed library; |
3136 ## otherwise, use our own copy. | 3143 ## otherwise, use our own copy. |
3137 if test "${HAVE_X11}" = "yes" ; then | 3144 if test "${HAVE_X11}" = "yes" ; then |
3146 fi | 3153 fi |
3147 LIBXMENU="\$(OLDXMENU)" | 3154 LIBXMENU="\$(OLDXMENU)" |
3148 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" | 3155 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" |
3149 else | 3156 else |
3150 OLDXMENU= | 3157 OLDXMENU= |
3151 LIBXMENU="-lXMenu" | 3158 ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). |
3159 if test "${HAVE_X_WINDOWS}" = "yes"; then | |
3160 LIBXMENU="-lXMenu" | |
3161 else | |
3162 LIBXMENU= | |
3163 fi | |
3152 LIBX_OTHER= | 3164 LIBX_OTHER= |
3153 fi | 3165 fi |
3154 | 3166 |
3155 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then | 3167 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then |
3156 OLDXMENU= | 3168 OLDXMENU= |
3476 | 3488 |
3477 /* Define HAVE_X_I18N if we have usable i18n support. */ | 3489 /* Define HAVE_X_I18N if we have usable i18n support. */ |
3478 | 3490 |
3479 #ifdef HAVE_X11R6 | 3491 #ifdef HAVE_X11R6 |
3480 #define HAVE_X_I18N | 3492 #define HAVE_X_I18N |
3481 #elif !defined X11R5_INHIBIT_I18N | |
3482 #define HAVE_X_I18N | |
3483 #endif | 3493 #endif |
3484 | 3494 |
3485 /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */ | 3495 /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */ |
3486 | 3496 |
3487 #if defined HAVE_X11R6 && !defined INHIBIT_X11R6_XIM | 3497 #if defined HAVE_X11R6 && !defined INHIBIT_X11R6_XIM |
3497 | 3507 |
3498 /* These won't be used automatically yet. We also need to know, at least, | 3508 /* These won't be used automatically yet. We also need to know, at least, |
3499 that the stack is continuous. */ | 3509 that the stack is continuous. */ |
3500 #ifdef __GNUC__ | 3510 #ifdef __GNUC__ |
3501 # ifndef GC_SETJMP_WORKS | 3511 # ifndef GC_SETJMP_WORKS |
3502 /* GC_SETJMP_WORKS is nearly always appropriate for GCC -- | 3512 /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ |
3503 see NON_SAVING_SETJMP in the target descriptions. */ | |
3504 /* Exceptions (see NON_SAVING_SETJMP in target description) are | |
3505 SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86. | |
3506 Fixme: Deal with SVR3. */ | |
3507 # define GC_SETJMP_WORKS 1 | 3513 # define GC_SETJMP_WORKS 1 |
3508 # endif | 3514 # endif |
3509 # ifndef GC_LISP_OBJECT_ALIGNMENT | 3515 # ifndef GC_LISP_OBJECT_ALIGNMENT |
3510 # define GC_LISP_OBJECT_ALIGNMENT (__alignof__ (Lisp_Object)) | 3516 # define GC_LISP_OBJECT_ALIGNMENT (__alignof__ (Lisp_Object)) |
3511 # endif | 3517 # endif |