X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.in;h=ab7410c8ffaa51a17ae28639186e52d7b0e060ab;hb=c22b401ea7242f5f796759d1abe3c8c3269d27b5;hp=58b3db1eb5c3f77350346e69f64ff2fe9e822ba0;hpb=1d9bc86590766427e2431876a50d78206a99edd5;p=chise%2Fxemacs-chise.git- diff --git a/configure.in b/configure.in index 58b3db1..ab7410c 100644 --- a/configure.in +++ b/configure.in @@ -369,6 +369,7 @@ with_widgets='' with_dialogs='' with_file_coding='' cpp='' cppflags='' libs='' ldflags='' +extra_includes='' dynamic='' with_x11='' with_msw='' @@ -797,6 +798,7 @@ The default is to autodetect all sound support."]) a | at | ath | athe | athen | athena ) val=athena ;; n | no | non | none ) val=no ;; y | ye | yes ) val=yes ;; + m | ms | msw ) val=msw ;; * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; esac @@ -1866,10 +1868,15 @@ test "$extra_verbose" = "yes" && \ have_terminfo mail_use_flock mail_use_lockf) && echo "" dnl Pick up mingw32 include path -case "$opsys" in mingw*) mingw_include=`eval "gcc -print-file-name=libc.a"` ; - mingw_include=`eval "dirname $mingw_include"` ; - mingw_include="-I$mingw_include/../include/mingw32" ; - XE_APPEND($mingw_include, c_switch_system) ;; +case "$opsys" in mingw* | cygwin*) + cygwin_include=`eval "gcc -print-file-name=libc.a"` ; + cygwin_include=`eval "dirname $cygwin_include"` ; + cygwin_include="-I$cygwin_include/../include" ; + extra_includes="$cygwin_include/mingw32 $cygwin_include/mingw $cygwin_include" ; + case "$opsys" in mingw*) + XE_APPEND($extra_includes, c_switch_system) ;; + esac + ;; esac dnl Non-ordinary link usually requires -lc @@ -1953,10 +1960,10 @@ case `uname -s`:`uname -m`:$GCC_VERSION in AC_MSG_ERROR(Aborting due to known problem) ;; *:i*86*:2.7.2*) - case "$GCC_VERSION" in - 2.7.2) - case "$CFLAGS" in - *-O2*|*-O3*) + case "$CFLAGS" in + *-O2*|*-O3*) + case "$GCC_VERSION" in + 2.7.2) case "$CFLAGS" in *-fno-strength-reduce*) ;; *) @@ -1968,17 +1975,17 @@ case `uname -s`:`uname -m`:$GCC_VERSION in esac ;; esac + case "$CFLAGS" in + *-fno-caller-saves*) ;; + *) + AC_MSG_RESULT(yes) + AC_MSG_WARN(Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using) + AC_MSG_WARN(-fno-caller-saves.) + AC_MSG_ERROR(Aborting due to known problem) + ;; + esac ;; esac - case "$CFLAGS" in - *-fno-caller-saves*) ;; - *) - AC_MSG_RESULT(yes) - AC_MSG_WARN(Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using) - AC_MSG_WARN(-fno-caller-saves.) - AC_MSG_ERROR(Aborting due to known problem) - ;; - esac ;; esac AC_MSG_RESULT(no) @@ -2339,6 +2346,7 @@ AC_PROG_YACC dnl checks for header files AC_CHECK_HEADERS(dnl a.out.h dnl + elf.h dnl cygwin/version.h dnl fcntl.h dnl inttypes.h dnl @@ -2761,6 +2769,12 @@ if test "$with_msw" != "no"; then AC_CHECK_LIB(gdi32,main,with_msw=yes) if test "$with_msw" = "yes"; then AC_DEFINE(HAVE_MS_WINDOWS) + + dnl The net installer only works with MS-Windows currently + XE_APPEND(netinstall, MAKE_SUBDIR) + XE_APPEND(netinstall, SRC_SUBDIR_DEPS) + XE_APPEND(netinstall, INSTALL_ARCH_DEP_SUBDIR) + install_pp="$blddir/lib-src/installexe.sh" XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lwinspool, libs_system) test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto) @@ -2959,8 +2973,8 @@ fi dnl Autodetect Drag'n'Drop support dnl always included if CDE, Offix, or MSWindows are defined -AC_MSG_CHECKING(if drag and drop API is needed) if test "$with_dragndrop" != "no" ; then + AC_MSG_CHECKING(if drag and drop API is needed) if test -n "$dragndrop_proto" ; then with_dragndrop=yes AC_MSG_RESULT([yes (${dragndrop_proto} )]) @@ -3455,7 +3469,6 @@ if test "$with_mule" = "yes" ; then if test "$with_utf_2000" = "yes" ; then AC_DEFINE(CHAR_IS_UCS4) AC_DEFINE(UTF2000) - AC_DEFINE(HAVE_GGC) fi AC_CHECKING(for Mule input methods) @@ -3493,7 +3506,7 @@ if test "$with_mule" = "yes" ; then if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then AC_DEFINE(USE_XFONTSET) if test "$with_xim" = "no" ; then - XE_ADD_OBJS(input-method-xfs.o) + XE_ADD_OBJS(input-method-xlib.o) fi fi fi dnl with_xfs @@ -4122,7 +4135,14 @@ typedef uint64_t u_int64_t; #if DB_VERSION_MAJOR > 1 yes #endif -], [AC_MSG_RESULT(2); dbfunc=db_open], [AC_MSG_RESULT(1); dbfunc=dbopen]) +], [AC_EGREP_CPP(yes, +[#include <$db_h_file> +#if DB_VERSION_MAJOR > 2 +yes +#endif +], [AC_MSG_RESULT(3); dbfunc=db_create],[ + AC_MSG_RESULT(2); dbfunc=db_open])],[ + AC_MSG_RESULT(1); dbfunc=dbopen]) AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [ AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)]) fi @@ -4163,8 +4183,16 @@ if test "$with_modules" != "no"; then else dnl Find headers and libraries AC_CHECK_HEADER(dlfcn.h, [ - AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [ - AC_CHECK_LIB(c, dlopen, [ have_dl=yes ])])]) + AC_MSG_CHECKING([for dlopen in -lc]) + AC_TRY_LINK([#include ],dnl + [dlopen ("", 0);], [ have_dl=yes ], [ + AC_MSG_CHECKING([for dlopen in -ldl]) + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + AC_TRY_LINK([#include ],dnl + [dlopen ("", 0);], [ have_dl=yes ], + [LIBS="$ac_save_LIBS"]) + ac_save_LIBS=])]) if test -n "$have_dl"; then AC_DEFINE(HAVE_DLOPEN) else @@ -4338,6 +4366,7 @@ AC_SUBST(pkgdir) AC_SUBST(statedir) AC_SUBST(libdir) AC_SUBST(mandir) +AC_SUBST(extra_includes) AC_SUBST(prefix) AC_SUBST(PREFIX_USER_DEFINED)