X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=491e596a27e9e867a123f483bc34d6cc9e239012;hp=f7841b84dd2906995d706a485e430ea8647f43a3;hb=32aabcd28583d369eb73325742ddb950bd9d6323;hpb=53386c359c55bd6eaa13c35fe174c9274ff5888e diff --git a/configure.ac b/configure.ac index f7841b8..491e596 100644 --- a/configure.ac +++ b/configure.ac @@ -13,13 +13,15 @@ dnl # see what flags are available. (Better yet, read the documentation!) # +AC_INIT([fptools build system], [1.0], [cvs-fptools@haskell.org], [fptools]) + # First off, a distrib sanity check.. -AC_INIT(mk/config.mk.in) +AC_CONFIG_SRCDIR([mk/config.mk.in]) dnl * We require autoconf version 2.52 dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE. dnl We need 2.52 due to the use of AS_TR_CPP and AS_TR_SH. -AC_PREREQ(2.52) +AC_PREREQ([2.52]) dnl * Declare subdirectories that have a private configure script dnl @@ -45,7 +47,7 @@ dnl * Choose host(/target/build) platform dnl-------------------------------------------------------------------- dnl Guess host/target/build platform(s) if necessary. -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET # "$host" defaults to "$target" if test "x$host" = xNONE ; then @@ -735,7 +737,7 @@ AC_ARG_ENABLE([openal], GhcLibsWithOpenAL=NO fi ], - [GhcLibsWithOpenAL=yes]) + [GhcLibsWithOpenAL=YES]) AC_SUBST([GhcLibsWithOpenAL]) @@ -856,48 +858,14 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar) dnl ** check for DocBook toolchain FP_CHECK_DOCBOOK_DTD -FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/sgml/docbook/docbook-xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl]) +FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /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]) FP_PROG_FO_PROCESSOR -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 /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl /usr/local/share/sgml/catalog glafp-utils/docbook/CATALOG*) -if test -z "$Catalog"; then - AC_MSG_RESULT([Warning: You will not be able to build the documentation.]) -fi -case $Catalog in - yes) # assume it is provided by other means (e.g., SGML_CATALOG_FILES env var). - Catalog= - ;; - glafp*) - case $HostOS_CPP in - mingw32) - if test "${OSTYPE}" == "msys" - then - Catalog=$hardtop/$Catalog - else - Catalog=`cygpath -w $hardtop/$Catalog` - fi - ;; - *) Catalog=$hardtop/$Catalog - ;; - esac - ;; -esac -AC_SUBST(Catalog) - - dnl ** check for ghc-pkg command -changequote(, )dnl -ghc_pkg_guess=`echo $WithGhc | sed 's@ghc\([^/\\]*\)$@ghc-pkg\1@'` -changequote([, ])dnl -if $ghc_pkg_guess -l >/dev/null 2>/dev/null; then - GhcPkgCmd=$ghc_pkg_guess - AC_MSG_NOTICE([using $ghc_pkg_guess for ghc-pkg]) -else - AC_PATH_PROG(GhcPkgCmd,ghc-pkg) -fi +FP_PROG_GHC_PKG + +dnl Check whether this GHC has readline installed +FPTOOLS_GHC_HAS_READLINE AC_ARG_WITH(greencard, [AC_HELP_STRING([--with-greencard=ARG], @@ -975,11 +943,12 @@ dnl off_t, because it will affect the result of that test. AC_SYS_LARGEFILE dnl ** check for specific header (.h) files that we are interested in -AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h limits.h locale.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stddef.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h bfd.h winsock.h pthread.h sys/uio.h) -AC_CHECK_HEADER(unistd.h,[AC_CHECK_FUNCS(lchown)]) +AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h]) + +AC_CHECK_HEADER([unistd.h], [AC_CHECK_FUNCS(lchown)]) -AC_CHECK_HEADER(readline/readline.h, [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO]) -AC_CHECK_HEADER(readline/history.h, [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO]) +AC_CHECK_HEADER([readline/readline.h], [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO]) +AC_CHECK_HEADER([readline/history.h], [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO]) if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then GhcLibsWithReadline=YES @@ -990,12 +959,6 @@ else fi AC_SUBST(GhcLibsWithReadline) -dnl ** check for DOS include files -AC_CHECK_HEADERS(dos.h conio.h io.h std.h) - -dnl ** check for Windows include files -AC_CHECK_HEADERS(windows.h) - dnl ** check for OpenGL/GLUT include paths and libraries FP_CHECK_GLUT @@ -1026,18 +989,9 @@ CPPFLAGS="$fp_save_cppflags" dnl ** check if it is safe to include both and AC_HEADER_TIME -dnl dynamic loading include files -AC_CHECK_HEADERS(dlfcn.h dl.h) - -dnl ** check for farcalloc (in bcc) -AC_CHECK_HEADER(alloc.h,[AC_CHECK_FUNCS(farcalloc)]) - -dnl ** check for valloc (in sunos, solaris, mips, amiga, next, minix, ultrix) -AC_CHECK_HEADER(malloc.h,[AC_CHECK_FUNCS(valloc)]) - dnl ** check for POSIX regex HavePosixRegex=NO -AC_CHECK_HEADERS(regex.h,[AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])]) +AC_CHECK_HEADERS([regex.h], [AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])]) AC_SUBST(HavePosixRegex) dnl ** how do we get a timezone name, and UTC offset ? @@ -1046,24 +1000,9 @@ AC_STRUCT_TIMEZONE dnl ** do we have altzone? FP_DECL_ALTZONE -dnl ** does struct stat contain st_blksize? -AC_STRUCT_ST_BLKSIZE - dnl ** do we have long longs? AC_CHECK_TYPES([long long]) -dnl ** check what fields struct msghdr contains -AC_CHECK_HEADERS([sys/types.h sys/socket.h sys/uio.h]) -AC_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights], [], [], [#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_SOCKET_H -# include -#endif -#if HAVE_SYS_UIO_H -# include -#endif]) - dnl ** what are the sizes of various types AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(double, 8) @@ -1175,16 +1114,16 @@ dnl ** check return type of signal handlers dnl Foo: assumes we can use prototypes. dnl On BCC, signal handlers have type "int(void)", elsewhere its "void(int)". dnl AC_CACHE_CHECK([type of signal handlers], ac_cv_type_signal_handler, -dnl [AC_TRY_COMPILE([#include +dnl [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include dnl #include dnl #ifdef signal dnl #undef signal dnl #endif dnl void (*signal (int, void (*)(int)))(int); -dnl ], -dnl [int i;], -dnl ac_cv_type_signal_handler=void_int, -dnl ac_cv_type_signal_handler=int_void)]) +dnl ]], +dnl [[int i;]])], +dnl [ac_cv_type_signal_handler=void_int], +dnl [ac_cv_type_signal_handler=int_void])]) dnl if test "$ac_cv_type_signal_handler" = void_int; then dnl AC_DEFINE(VOID_INT_SIGNALS) dnl fi @@ -1196,20 +1135,7 @@ if test "$ac_cv_type_signal" = void; then fi dnl ** check for more functions -AC_CHECK_FUNCS(strcasecmp _stricmp stricmp strcmpi) -AC_CHECK_FUNCS(strcmp) -AC_CHECK_FUNCS(realpath _fullpath) -AC_CHECK_FUNCS(PBHSetVolSync macsystem) -AC_CHECK_FUNCS(fgetpos fsetpos fseek ftell) -AC_CHECK_FUNCS(vsnprintf _vsnprintf) -AC_CHECK_FUNCS(snprintf _snprintf ) -AC_CHECK_FUNCS(popen _popen ) -AC_CHECK_FUNCS(pclose _pclose ) -AC_CHECK_FUNCS(setenv unsetenv) - - -dnl ** check for specific library functions that we are interested in -AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat siginterrupt symlink sysconf timelocal times vadvise localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r) +AC_CHECK_FUNCS([ftime getclock getgrgid_r getgrnam_r getpagesize getpwnam_r getpwuid_r getpwnam getpwuid getrusage gettimeofday gmtime_r localtime_r lstat readdir_r readlink setenv setitimer siginterrupt symlink sysconf times unsetenv]) dnl ** Solaris2 needs additionl flag for getpw*_r() case "$TargetPlatform" in @@ -1263,9 +1189,7 @@ AC_CHECK_LIB(bfd, bfd_init) dnl ** check for wide-char classifications dnl FreeBSD has an emtpy wctype.h, so test one of the affected dnl functions if it's really there. -AC_CHECK_HEADERS(wctype.h, - [AC_CHECK_FUNCS(iswspace)] -) +AC_CHECK_HEADERS([wctype.h], [AC_CHECK_FUNCS(iswspace)]) dnl ** check for readline, for Hugs and hslibs' Readline dnl ncurses supersedes termcap and curses, but for compatibility, @@ -1344,7 +1268,6 @@ else AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if you need -ldl to get dlopen().]) LIBS="$LIBS -ldl"], [HaveLibDL=NO]) - AC_CHECK_FUNCS(dlopen) AC_SUBST(HaveLibDL) dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set @@ -1438,30 +1361,6 @@ case "$cv_func_usleep_return_type" in esac dnl -------------------------------------------------- -dnl * test for in_addr_t -dnl -------------------------------------------------- -AC_MSG_CHECKING(for in_addr_t in netinet/in.h) -AC_EGREP_HEADER(in_addr_t, netinet/in.h, - [ AC_DEFINE([HAVE_IN_ADDR_T], [1], [Define to 1 if in_addr_t is available.]) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- -dnl * test for Linux sendfile(2) -dnl -------------------------------------------------- -AC_MSG_CHECKING(for sendfile in sys/sendfile.h) -AC_EGREP_HEADER(sendfile, sys/sendfile.h, - [ AC_DEFINE([HAVE_LINUX_SENDFILE], [1], [Define to 1 if you have a Linux sendfile(2) implementation.]) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- -dnl * test for BSD sendfile(2) -dnl -------------------------------------------------- -AC_MSG_CHECKING(for sendfile in sys/socket.h) -AC_EGREP_HEADER(sendfile, sys/socket.h, - [ AC_DEFINE([HAVE_BSD_SENDFILE], [1], [Define to 1 if you have a BSDish sendfile(2) implementation.]) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- dnl * test for GTK+ dnl -------------------------------------------------- @@ -1483,7 +1382,7 @@ dnl ** can we get alloca? AC_FUNC_ALLOCA dnl ** Working vfork? -AC_FUNC_VFORK +AC_FUNC_FORK dnl ** determine whether or not const works AC_C_CONST @@ -1492,7 +1391,7 @@ dnl ** are we big endian? AC_C_BIGENDIAN dnl ** check for leading underscores in symbol names -FPTOOLS_UNDERSCORE +FP_LEADING_UNDERSCORE dnl ** check for ld, and whether ld has -x option AC_PATH_PROG(LdCmdRaw, ld) @@ -1513,37 +1412,6 @@ FPTOOLS_LD_X FP_EMPTY_STRUCTS -AC_MSG_CHECKING([for SIGPOLL]) -AC_EGREP_CPP(we_have_sigpoll, -[#include -#ifdef SIGPOLL -we_have_sigpoll -#endif -], AC_DEFINE([HAVE_SIGPOLL], [1], [Define to 1 if you have the sigpoll() function.]) haveSIGPOLL=yes, haveSIGPOLL=no) -AC_MSG_RESULT([$haveSIGPOLL]) - -AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX]) -AC_EGREP_CPP(we_have_that_sysconf_thing, -[ -#include -#ifdef _SC_GETGR_R_SIZE_MAX -we_have_that_sysconf_thing -#endif -], -[AC_MSG_RESULT([yes]) -AC_DEFINE([HAVE_SC_GETGR_R_SIZE_MAX], [1], [Define to 1 if defines _SC_GETGR_R_SIZE_MAX.])], -[AC_MSG_RESULT([no])]) - -AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX]) -AC_EGREP_CPP(we_have_that_sysconf_thing, -[ -#include -#ifdef _SC_GETPW_R_SIZE_MAX -we_have_that_sysconf_thing -#endif -], -[AC_MSG_RESULT([yes]) -AC_DEFINE([HAVE_SC_GETPW_R_SIZE_MAX], [1], [Define to 1 if defines _SC_GETPW_R_SIZE_MAX.])], -[AC_MSG_RESULT([no])]) - -AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h ) +AC_CONFIG_FILES([mk/config.mk]) +AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) +AC_OUTPUT