| author | Camm Maguire <camm@debian.org> | 2003年07月17日 18:01:33 +0000 |
|---|---|---|
| committer | Camm Maguire <camm@debian.org> | 2003年07月17日 18:01:33 +0000 |
| commit | 3486b6a0e8a28a854b3c03d06185addd9c44dc3a (patch) | |
| tree | 728dc643ea424fc3c04ecb883b3f8caaadec031e | |
| parent | 11661a563ad3738025dacf7c4e2c34db5404ac21 (diff) | |
| download | gcl-unlabeled-1.112.4.tar.gz | |
| -rw-r--r-- | gcl/configure.in | 30 |
diff --git a/gcl/configure.in b/gcl/configure.in index 0b71f7ce4..21b2b4161 100644 --- a/gcl/configure.in +++ b/gcl/configure.in @@ -1,7 +1,7 @@ AC_INIT() AC_CONFIG_HEADER(h/gclincl.h) -VERSION=2.5.0 +VERSION=2.5.4 AC_SUBST(VERSION) # some parts of this configure script are taken from the tcl configure.in @@ -47,6 +47,9 @@ AC_ARG_ENABLE(common-binary,[ --enable-common-binary=yes forces use of lowest co AC_ARG_ENABLE(japi,[ --enable-japi=yes will compile in support for the JAPI graphical interface if present on your system], [try_japi=$enableval],[try_japi="no"]) +AC_ARG_ENABLE(xdr,[ --enable-xdr=yes will compile in support for XDR], +[try_xdr=$enableval],[try_xdr="no"]) + # # Host information # @@ -203,7 +206,7 @@ case $canonical in i*mingw*) if test "$use_common_binary" = "yes"; then host=i386-pc-mingw32 - PROCESSOR_FLAGS="-march=i386 " + PROCESSOR_FLAGS="-mcpu=i386 -march=i386 " echo "The host is canonicalised to $host" fi use=mingw;; @@ -829,12 +832,23 @@ AC_EGREP_HEADER([gettimeofday], AC_CHECK_LIB(m,sin,LIBS="${LIBS} -lm",true) AC_CHECK_LIB(mingwex,main,LIBS="${LIBS} -lmingwex",true) -# AC_CHECK_LIB(japi,j_start,LIBS="${LIBS} -ljapi -lwsock32",true) +# AC_CHECK_LIB(japi,j_start,LIBS="${LIBS} -ljapi -lws2_32",true) EXTRA_LOBJS= if test "$try_japi" = "yes" ; then AC_CHECK_HEADERS(japi.h,[AC_DEFINE(HAVE_JAPI_H) EXTRA_LOBJS="${EXTRA_LOBJS} japi.o" - LIBS="${LIBS} -ljapi -lwsock32"] ) + LIBS="${LIBS} -ljapi -lws2_32"] ) +fi +if test "$use" = "mingw" ; then + if test "$try_xdr" = "yes" ; then + AC_CHECK_HEADERS(rpc/rpc.h,[AC_DEFINE(HAVE_XDR) + LIBS="${LIBS} -loncrpc"] ) + fi +else + if test "$try_xdr" = "yes" ; then + AC_CHECK_HEADERS(rpc/rpc.h,[AC_DEFINE(HAVE_XDR) + LIBS="${LIBS} -lrpc"] ) + fi fi # Should really find a way to check for prototypes, but this @@ -1187,8 +1201,12 @@ cat >> conftest.el <<EOF EOF AC_MSG_CHECKING([emacs info/dir]) -if [[ "$EMACS" != "" ]] && [[ "$INFO_DIR" = "unknown" ]] ; then +if test "$use" = "mingw" ; then + INFO_DIR=\$\(prefix\)/lib/gcl-$VERSION/info/ +else + if [[ "$EMACS" != "" ]] && [[ "$INFO_DIR" = "unknown" ]] ; then INFO_DIR=`$EMACS -q -batch --no-site-file -l conftest.el 2>&1 | sed -e /Loading/d | sed -e /load/d ` + fi fi if test -f "${INFO_DIR}dir" ; then true;else if test -f /usr/info/dir ; then @@ -1416,7 +1434,7 @@ AC_SUBST(EXTRA_LOBJS) if test -f h/$use.defs ; then AC_SUBST(use) - AC_OUTPUT(makedefc windows/gcl.iss bin/gcl.bat) + AC_OUTPUT(makedefc windows/gcl.iss windows/gcl.ansi.iss windows/install.ansi.lsp windows/install.lsp ) echo makedefc cat makedefc |