projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #1784: EM_AMD64 and EM_X86_64 might both be defined to the same value
[ghc-hetmet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
e379721
..
b63d25f
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-13,7
+13,7
@@
dnl
# see what flags are available. (Better yet, read the documentation!)
#
# see what flags are available. (Better yet, read the documentation!)
#
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.9], [glasgow-haskell-bugs@haskell.org], [ghc])
# Set this to YES for a released version, otherwise NO
: ${RELEASE=NO}
# Set this to YES for a released version, otherwise NO
: ${RELEASE=NO}
@@
-100,6
+100,7
@@
if test x"$TargetPlatform" != x"$HostPlatform" ; then
fi
exeext=''
fi
exeext=''
+soext='.so'
#
# The following will be more difficult when we *are* cross-compiling.
# Suitable names to slam in *_CPP are in platform.h.in.
#
# The following will be more difficult when we *are* cross-compiling.
# Suitable names to slam in *_CPP are in platform.h.in.
@@
-295,6
+296,7
@@
i[[3456]]86-*-cygwin*)
HostVendor_CPP='unknown'
HostOS_CPP='cygwin32'
exeext='.exe'
HostVendor_CPP='unknown'
HostOS_CPP='cygwin32'
exeext='.exe'
+ soext='.dll'
;;
i[[3456]]86-*-mingw32*)
HostPlatform=i386-unknown-mingw32 # hack again
;;
i[[3456]]86-*-mingw32*)
HostPlatform=i386-unknown-mingw32 # hack again
@@
-305,6
+307,7
@@
i[[3456]]86-*-mingw32*)
HostVendor_CPP='unknown'
HostOS_CPP='mingw32'
exeext='.exe'
HostVendor_CPP='unknown'
HostOS_CPP='mingw32'
exeext='.exe'
+ soext='.dll'
;;
i[[3456]]86-apple-darwin*)
HostPlatform=i386-apple-darwin
;;
i[[3456]]86-apple-darwin*)
HostPlatform=i386-apple-darwin
@@
-314,6
+317,7
@@
i[[3456]]86-apple-darwin*)
HostArch_CPP='i386'
HostVendor_CPP='apple'
HostOS_CPP='darwin'
HostArch_CPP='i386'
HostVendor_CPP='apple'
HostOS_CPP='darwin'
+ soext='.dylib'
;;
i[[3456]]86-*-gnu*)
HostPlatform=i386-unknown-gnu
;;
i[[3456]]86-*-gnu*)
HostPlatform=i386-unknown-gnu
@@
-350,6
+354,7
@@
x86_64-apple-darwin*)
HostArch_CPP='x86_64'
HostVendor_CPP='apple'
HostOS_CPP='darwin'
HostArch_CPP='x86_64'
HostVendor_CPP='apple'
HostOS_CPP='darwin'
+ soext='.dylib'
;;
m68k-*-linux*)
HostPlatform=m68k-unknown-linux # hack again
;;
m68k-*-linux*)
HostPlatform=m68k-unknown-linux # hack again
@@
-476,6
+481,7
@@
powerpc-apple-darwin*)
HostArch_CPP='powerpc'
HostVendor_CPP='apple'
HostOS_CPP='darwin'
HostArch_CPP='powerpc'
HostVendor_CPP='apple'
HostOS_CPP='darwin'
+ soext='.dylib'
;;
powerpc-unknown-linux*)
HostPlatform=powerpc-unknown-linux
;;
powerpc-unknown-linux*)
HostPlatform=powerpc-unknown-linux
@@
-608,6
+614,7
@@
AC_SUBST(BuildVendor_CPP)
AC_SUBST(TargetVendor_CPP)
AC_SUBST(exeext)
AC_SUBST(TargetVendor_CPP)
AC_SUBST(exeext)
+AC_SUBST(soext)
dnl --------------------------------------------------------------
dnl * Project specific configuration options
dnl --------------------------------------------------------------
dnl * Project specific configuration options
@@
-869,9
+876,7
@@
dnl If gcc, make sure it's at least 2.1
dnl
FP_HAVE_GCC
FP_MINGW_GCC
dnl
FP_HAVE_GCC
FP_MINGW_GCC
-FP_GCC_NEEDS_NO_OMIT_LFPTR
-FP_GCC_HAS_NO_UNIT_AT_A_TIME
-FP_GCC_HAS_WRAPV
+FP_GCC_EXTRA_FLAGS
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
@@
-1061,6
+1066,13
@@
fi
dnl ** check for more functions
dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r])
dnl ** check for more functions
dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r])
+dnl ** On OS X 10.4 (at least), time.h doesn't declare ctime_r if
+dnl ** _POSIX_C_SOURCE is defined
+AC_CHECK_DECLS([ctime_r], , ,
+[#define _POSIX_SOURCE 1
+#define _POSIX_C_SOURCE 199506L
+#include <time.h>])
+
dnl ** For ghc/rts/gmp:
AC_CHECK_FUNCS([getpagesize])
dnl ** For ghc/rts/gmp:
AC_CHECK_FUNCS([getpagesize])
@@
-1068,6
+1080,9
@@
dnl ** check whether this machine has gmp3 installed
AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp3,
HaveLibGmp=NO; LibGmp=not-installed))
AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp3,
HaveLibGmp=NO; LibGmp=not-installed))
+ if test $HaveLibGmp = YES; then
+ AC_DEFINE([HAVE_LIB_GMP], [1], [Define to 1 if GMP library is installed.])
+ fi;
AC_SUBST(HaveLibGmp)
AC_SUBST(LibGmp)
AC_SUBST(HaveLibGmp)
AC_SUBST(LibGmp)
@@
-1220,6
+1235,6
@@
else
fi
AC_SUBST(HavePapi)
fi
AC_SUBST(HavePapi)
-AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml])
+AC_CONFIG_FILES([mk/config.mk ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
AC_OUTPUT
AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
AC_OUTPUT