X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=57174a26f267cc2aa1c33939ca41cec1927072eb;hb=b20e2bee6b0a734563f456dc346f91a3286d84b0;hp=96c110f03c9c8d5d2b31a313a0c9d9de483716cd;hpb=e23cf9de769cbb80c3f908da2af59b26d740d4a7;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index 96c110f..57174a2 100644 --- a/configure.ac +++ b/configure.ac @@ -58,25 +58,6 @@ if test x"$srcdir" != 'x.' ; then exit 1 fi -dnl-------------------------------------------------------------------- -dnl * Deal with arguments telling us gmp is somewhere odd -dnl-------------------------------------------------------------------- - -FP_ARG_GMP - -GMP_INCLUDE_DIRS= -GMP_LIB_DIRS= -if test "x$gmp_libraries" != "xNONE"; then - LDFLAGS="-L$gmp_libraries $LDFLAGS" - GMP_LIB_DIRS=$gmp_libraries -fi -if test "x$gmp_includes" != "xNONE"; then - CPPFLAGS="-I$gmp_includes $CPPFLAGS" - GMP_INCLUDE_DIRS=$gmp_includes -fi -AC_SUBST(GMP_INCLUDE_DIRS) -AC_SUBST(GMP_LIB_DIRS) - dnl -------------------------------------------------------------- dnl * Project specific configuration options dnl -------------------------------------------------------------- @@ -292,10 +273,10 @@ BuildPlatform=$build BuildArch=`echo "$build" | sed 's/-.*//'` BuildVendor=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/'` BuildOS=`echo "$build" | sed 's/.*-//'` -BuildPlatform_CPP=`echo "$BuildPlatform" | sed 's/\.\|-/_/g'` -BuildArch_CPP=`echo "$BuildArch" | sed 's/\.\|-/_/g'` -BuildVendor_CPP=`echo "$BuildVendor" | sed 's/\.\|-/_/g'` -BuildOS_CPP=`echo "$BuildOS" | sed 's/\.\|-/_/g'` +BuildPlatform_CPP=`echo "$BuildPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'` +BuildArch_CPP=` echo "$BuildArch" | sed -e 's/\./_/g' -e 's/-/_/g'` +BuildVendor_CPP=` echo "$BuildVendor" | sed -e 's/\./_/g' -e 's/-/_/g'` +BuildOS_CPP=` echo "$BuildOS" | sed -e 's/\./_/g' -e 's/-/_/g'` checkArch "$BuildArch" checkVendor "$BuildVendor" @@ -305,10 +286,10 @@ HostPlatform=$host HostArch=`echo "$host" | sed 's/-.*//'` HostVendor=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/'` HostOS=`echo "$host" | sed 's/.*-//'` -HostPlatform_CPP=`echo "$HostPlatform" | sed 's/\.\|-/_/g'` -HostArch_CPP=`echo "$HostArch" | sed 's/\.\|-/_/g'` -HostVendor_CPP=`echo "$HostVendor" | sed 's/\.\|-/_/g'` -HostOS_CPP=`echo "$HostOS" | sed 's/\.\|-/_/g'` +HostPlatform_CPP=`echo "$HostPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'` +HostArch_CPP=` echo "$HostArch" | sed -e 's/\./_/g' -e 's/-/_/g'` +HostVendor_CPP=` echo "$HostVendor" | sed -e 's/\./_/g' -e 's/-/_/g'` +HostOS_CPP=` echo "$HostOS" | sed -e 's/\./_/g' -e 's/-/_/g'` checkArch "$HostArch" checkVendor "$HostVendor" @@ -318,10 +299,10 @@ TargetPlatform=$target TargetArch=`echo "$target" | sed 's/-.*//'` TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'` TargetOS=`echo "$target" | sed 's/.*-//'` -TargetPlatform_CPP=`echo "$TargetPlatform" | sed 's/\.\|-/_/g'` -TargetArch_CPP=`echo "$TargetArch" | sed 's/\.\|-/_/g'` -TargetVendor_CPP=`echo "$TargetVendor" | sed 's/\.\|-/_/g'` -TargetOS_CPP=`echo "$TargetOS" | sed 's/\.\|-/_/g'` +TargetPlatform_CPP=`echo "$TargetPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'` +TargetArch_CPP=` echo "$TargetArch" | sed -e 's/\./_/g' -e 's/-/_/g'` +TargetVendor_CPP=` echo "$TargetVendor" | sed -e 's/\./_/g' -e 's/-/_/g'` +TargetOS_CPP=` echo "$TargetOS" | sed -e 's/\./_/g' -e 's/-/_/g'` checkArch "$TargetArch" checkVendor "$TargetVendor" @@ -621,8 +602,7 @@ fi dnl ** check for DocBook toolchain FP_CHECK_DOCBOOK_DTD -FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl]) - +FP_DOCBOOK_XSL FP_PROG_DBLATEX FP_PROG_HSTAGS @@ -739,7 +719,7 @@ 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, sched_setaffinity]) +AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r sched_setaffinity setlocale]) AC_TRY_RUN([ #include @@ -760,36 +740,6 @@ AC_CHECK_DECLS([ctime_r], , , #define _POSIX_C_SOURCE 199506L #include ]) -dnl ** For ghc/rts/gmp: -AC_CHECK_FUNCS([getpagesize]) - -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)) - 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) - -dnl ** (Mac OS X only: check for GMP.framework) -HaveFrameworkGMP=NO -case $HostPlatform in -*-apple-darwin) - AC_MSG_CHECKING([for GMP.framework]) - save_libs="$LIBS" - LIBS="-framework GMP" - AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,) - if test $HaveFrameworkGMP = YES; then - AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).]) - fi; - LIBS="$save_libs" - AC_MSG_RESULT([$HaveFrameworkGMP]) - ;; -esac -AC_SUBST(HaveFrameworkGMP) - dnl ** check for mingwex library AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO) AC_SUBST(HaveLibMingwEx) @@ -798,12 +748,6 @@ if test $HaveLibMingwEx = YES ; then AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.]) fi -if test "$HaveLibGmp" = "NO"; then -if test "$HostArch_CPP" = "ia64" -o "$HostArch_CPP" = "mipseb" ; then -AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64 or mips64).]) -fi; -fi; - dnl ** check whether this machine has BFD and liberty installed (used for debugging) dnl the order of these tests matters: bfd needs liberty AC_CHECK_LIB(iberty, xmalloc) @@ -922,7 +866,7 @@ else fi AC_SUBST(HavePapi) -if test "$DIR_DOCBOOK_XSL" = "" || +if test "$HAVE_DOCBOOK_XSL" = "NO" || test "$XsltprocCmd" = "" then BUILD_DOCBOOK_HTML=NO @@ -942,7 +886,7 @@ fi AC_SUBST(BUILD_DOCBOOK_PS) AC_SUBST(BUILD_DOCBOOK_PDF) -AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml]) +AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT @@ -992,10 +936,12 @@ echo ["\ which is version : $GccVersion ld : $LdCmd - Happy : $HappyCmd - Alex : $AlexCmd + Happy : $HappyCmd ($HappyVersion) + Alex : $AlexCmd ($AlexVersion) Python : $PythonCmd - Perl : $PerlCmd"] + Perl : $PerlCmd + dblatex : $DblatexCmd + xsltproc : $XsltprocCmd"] if test "$HSCOLOUR" = ""; then echo [" @@ -1007,11 +953,12 @@ echo ["\ "] fi -echo "Building DocBook HTML documentation: $BUILD_DOCBOOK_HTML" -echo "Building DocBook PS documentation: $BUILD_DOCBOOK_PS" -echo "Building DocBook PDF documentation: $BUILD_DOCBOOK_PDF" +echo ["\ + Building DocBook HTML documentation : $BUILD_DOCBOOK_HTML + Building DocBook PS documentation : $BUILD_DOCBOOK_PS + Building DocBook PDF documentation : $BUILD_DOCBOOK_PDF -echo ["Building shared libraries : $BuildSharedLibs"] + Building shared libraries : $BuildSharedLibs"] echo ["---------------------------------------------------------------------- "]