X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/5e159d07ec0bbb58b27538d5c129e7e6eb146e97..e24d49123cb9d13332ca2fc108b28e4144e4f10a:/configure diff --git a/configure b/configure index 5f40f95635..18fd1f9178 100755 --- a/configure +++ b/configure @@ -1358,7 +1358,7 @@ Optional Packages: --with-kerberos5 support Kerberos version 5 authenticated POP --with-hesiod support Hesiod to get the POP server host --without-sound don't compile with sound support - --without-sync-input Process async input synchronously + --without-sync-input process async input synchronously --with-x-toolkit=KIT use an X toolkit (KIT one of: yes, lucid, athena, motif, gtk, no) --without-xpm don't compile with XPM image support @@ -1382,7 +1382,10 @@ Optional Packages: --without-makeinfo don't require makeinfo for building manuals --with-pkg-config-prog=PATH - Path to pkg-config for finding GTK and librsvg + path to pkg-config for finding GTK and librsvg + --with-gnustep-conf=PATH + path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, + or /etc/GNUstep/GNUstep.conf --with-x use the X Window System Some influential environment variables: @@ -2158,6 +2161,17 @@ if test "X${with_pkg_config_prog}" != X; then fi fi + +# Check whether --with-gnustep-conf was given. +if test "${with_gnustep_conf+set}" = set; then + withval=$with_gnustep_conf; +fi + +test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \ + GNUSTEP_CONFIG_FILE="${with_gnustep_conf}" +test "X$GNUSTEP_CONFIG_FILE" = "X" && \ + GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf + # Check whether --enable-cocoa-experimental-ctrl-g was given. if test "${enable_cocoa_experimental_ctrl_g+set}" = set; then enableval=$enable_cocoa_experimental_ctrl_g; EN_COCOA_EXPERIMENTAL_CTRL_G=$enableval @@ -2581,11 +2595,16 @@ _ACEOF NON_GNU_CPP=/usr/ccs/lib/cpp RANLIB="ar -ts" ;; - *-sunos5* | *-solaris* ) + *-sunos5.[7-9]* | *-solaris2.[7-9]* ) opsys=sol2-6 emacs_check_sunpro_c=yes NON_GNU_CPP=/usr/ccs/lib/cpp ;; + *-sunos5* | *-solaris* ) + opsys=sol2-10 + emacs_check_sunpro_c=yes + NON_GNU_CPP=/usr/ccs/lib/cpp + ;; esac ## Watch out for a compiler that we know will not work. case "${canonical}" in @@ -2650,6 +2669,11 @@ _ACEOF machine=xtensa opsys=gnu-linux ;; + ## SuperH Linux-based GNU system + sh[34]*-*-linux-gnu* ) + machine=sh3 opsys=gnu-linux + ;; + * ) unported=yes ;; @@ -9194,15 +9218,15 @@ if test "${with_ns}" != no; then ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base - elif test -f /etc/GNUstep/GNUstep.conf; then + elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes ns_appdir=`pwd`/nextstep/Emacs.app ns_appbindir=`pwd`/nextstep/Emacs.app ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)" - GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" - GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" + GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" + GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" + GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" @@ -9335,6 +9359,12 @@ echo "${ECHO_T}$ac_cv_header_AppKit_AppKit_h" >&6; } fi if test $ac_cv_header_AppKit_AppKit_h = yes; then HAVE_NS=yes +else + { { echo "$as_me:$LINENO: error: \`--with-ns' was specified, but the include + files are missing or cannot be compiled." >&5 +echo "$as_me: error: \`--with-ns' was specified, but the include + files are missing or cannot be compiled." >&2;} + { (exit 1); exit 1; }; } fi @@ -12545,7 +12575,7 @@ fi ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. HAVE_XFT=maybe -if test "x${with_freetype}" = "xno"; then +if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then with_xft="no"; fi if test "x${with_xft}" != "xno"; then @@ -12871,7 +12901,7 @@ HAVE_FREETYPE=no ### Use -lfreetype if available, unless `--with-freetype=no'. if test "${HAVE_XFT}" = "yes"; then HAVE_FREETYPE=yes -elif test "x${with_freetype}" != "xno"; then +elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then succeeded=no @@ -13181,7 +13211,8 @@ _ACEOF fi HAVE_M17N_FLT=no -if test "${with_m17n_flt}" != "no"; then +if test "${HAVE_LIBOTF}" = yes; then + if test "${with_m17n_flt}" != "no"; then succeeded=no @@ -13276,12 +13307,13 @@ echo "${ECHO_T}no" >&6; } HAVE_M17N_FLT=no fi - if test "$HAVE_M17N_FLT" = "yes"; then + if test "$HAVE_M17N_FLT" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_M17N_FLT 1 _ACEOF + fi fi fi @@ -16660,6 +16692,7 @@ cat >>conftest.$ac_ext <<_ACEOF # endif #endif +#include #include #ifdef HAVE_UNISTD_H @@ -16808,12 +16841,15 @@ main () isn't worth using anyway. */ alarm (60); - for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) - continue; - time_t_max--; - if ((time_t) -1 < 0) - for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) - continue; + for (;;) + { + t = (time_t_max << 1) + 1; + if (t <= time_t_max) + break; + time_t_max = t; + } + time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) { @@ -16828,10 +16864,12 @@ main () && mktime_test ((time_t) (60 * 60 * 24)))) return 1; - for (j = 1; 0 < j; j *= 2) + for (j = 1; ; j <<= 1) if (! bigtime_test (j)) return 1; - if (! bigtime_test (j - 1)) + else if (INT_MAX / 2 < j) + break; + if (! bigtime_test (INT_MAX)) return 1; } return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); @@ -24291,7 +24329,7 @@ echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT} echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" echo " Does Emacs use -lxft? ${HAVE_XFT}" -echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" +echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo if test $USE_XASSERTS = yes; then