projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-04-18 01:49:22 by dsyme]
[ghc-hetmet.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
b852836
..
857a996
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-204,9
+204,9
@@
i[[3456]]86-*-mingw32*)
exeext='.exe'
# We assume you're using mingw32 via the gcc that comes
# with cygwin, and not the native port, so let's augment
exeext='.exe'
# We assume you're using mingw32 via the gcc that comes
# with cygwin, and not the native port, so let's augment
- # the gcc command-line used here with -mno-cygwin to
- # arrange for good things to happen.
- CFLAGS="-mno-cygwin $CFLAGS"
+ # the gcc command-line used here with -mno-cygwin -mwin32
+ # to arrange for good things to happen.
+ CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
;;
m68k-next-nextstep2)
HostPlatform_CPP='m68k_next_nextstep2'
;;
m68k-next-nextstep2)
HostPlatform_CPP='m68k_next_nextstep2'
@@
-510,6
+510,11
@@
FPTOOLS_HAVE_GCC
dnl ** figure out how to invoke cpp directly (gcc -E is no good)
AC_PROG_CPP
dnl ** figure out how to invoke cpp directly (gcc -E is no good)
AC_PROG_CPP
+case $HostOS_CPP in
+mingw32)
+ CPP="$CPP -mno-cygwin -mwin32"
+ ;;
+esac
dnl ** figure out how to do context diffs
FPTOOLS_PROG_DIFF
dnl ** figure out how to do context diffs
FPTOOLS_PROG_DIFF
@@
-559,7
+564,7
@@
AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
dnl ** check for jade/openjade & determine a working catalog
AC_PATH_PROGS(JadeCmd,openjade jade,jade)
FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl,
dnl ** check for jade/openjade & determine a working catalog
AC_PATH_PROGS(JadeCmd,openjade jade,jade)
FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl,
- /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
+ /etc/sgml/catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
if test -z "$Catalog"; then
AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
fi
if test -z "$Catalog"; then
AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
fi
@@
-577,7
+582,7
@@
AC_SUBST(CompressSuffix)
dnl ** check for installed happy binary + version
dnl (don't do it if we're booting from .hc files though.)
dnl ** check for installed happy binary + version
dnl (don't do it if we're booting from .hc files though.)
-if (test "$BootingFromHc" = "NO"); then
+if test "$BootingFromHc" = "NO"; then
FPTOOLS_HAPPY
fi;
FPTOOLS_HAPPY
fi;
@@
-842,6
+847,14
@@
else
fi
AC_SUBST(LibsReadline)
fi
AC_SUBST(LibsReadline)
+if test "$HaveLibReadline"; then
+ AC_CHECK_LIB(readline, rl_erase_empty_line,
+ [AC_DEFINE(HAVE_READLINE_4, 1)],
+ [AC_DEFINE(HAVE_READLINE_4, 0)])
+else
+ AC_DEFINE(HAVE_READLINE_4, 0)
+fi
+
dnl ** check for math library
FPTOOLS_CHECK_LIBM()
AC_SUBST(LIBM)
dnl ** check for math library
FPTOOLS_CHECK_LIBM()
AC_SUBST(LIBM)