diff options
| -rw-r--r-- | aclocal.m4 | 30 | ||||
| -rw-r--r-- | configure.ac | 38 |
2 files changed, 34 insertions, 34 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index e194afe60a..b2f0f9e6f1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -909,7 +909,7 @@ AC_DEFUN( [FP_DEFAULT_CHOICE_OVERRIDE_CHECK], [AC_ARG_ENABLE( [$1], - [AC_HELP_STRING( + [AS_HELP_STRING( [--enable-$1], [$5])], [AS_IF( @@ -1847,12 +1847,12 @@ AC_DEFUN([FP_ICONV], dnl environment. AC_ARG_WITH([iconv-includes], - [AC_HELP_STRING([--with-iconv-includes], + [AS_HELP_STRING([--with-iconv-includes], [directory containing iconv.h])], [ICONV_INCLUDE_DIRS=$withval]) AC_ARG_WITH([iconv-libraries], - [AC_HELP_STRING([--with-iconv-libraries], + [AS_HELP_STRING([--with-iconv-libraries], [directory containing iconv library])], [ICONV_LIB_DIRS=$withval]) @@ -1869,23 +1869,23 @@ AC_DEFUN([FP_GMP], dnl-------------------------------------------------------------------- AC_ARG_WITH([gmp-includes], - [AC_HELP_STRING([--with-gmp-includes], + [AS_HELP_STRING([--with-gmp-includes], [directory containing gmp.h])], [GMP_INCLUDE_DIRS=$withval]) AC_ARG_WITH([gmp-libraries], - [AC_HELP_STRING([--with-gmp-libraries], + [AS_HELP_STRING([--with-gmp-libraries], [directory containing gmp library])], [GMP_LIB_DIRS=$withval]) AC_ARG_WITH([intree-gmp], - [AC_HELP_STRING([--with-intree-gmp], + [AS_HELP_STRING([--with-intree-gmp], [force using the in-tree GMP])], [GMP_FORCE_INTREE=YES], [GMP_FORCE_INTREE=NO]) AC_ARG_WITH([gmp-framework-preferred], - [AC_HELP_STRING([--with-gmp-framework-preferred], + [AS_HELP_STRING([--with-gmp-framework-preferred], [on OSX, prefer the GMP framework to the gmp lib])], [GMP_PREFER_FRAMEWORK=YES], [GMP_PREFER_FRAMEWORK=NO]) @@ -1905,7 +1905,7 @@ AC_DEFUN([FP_CURSES], dnl-------------------------------------------------------------------- AC_ARG_WITH([curses-libraries], - [AC_HELP_STRING([--with-curses-libraries], + [AS_HELP_STRING([--with-curses-libraries], [directory containing curses libraries])], [CURSES_LIB_DIRS=$withval]) @@ -2349,7 +2349,7 @@ AC_DEFUN([FP_CPP_CMD_WITH_ARGS],[ dnl ** what cpp to use? dnl -------------------------------------------------------------- AC_ARG_WITH(hs-cpp, -[AC_HELP_STRING([--with-hs-cpp=ARG], +[AS_HELP_STRING([--with-hs-cpp=ARG], [Path to the (C) preprocessor for Haskell files [default=autodetect]])], [ if test "$HostOS" = "mingw32" @@ -2403,7 +2403,7 @@ AC_ARG_WITH(hs-cpp, dnl ** what cpp flags to use? dnl ----------------------------------------------------------- AC_ARG_WITH(hs-cpp-flags, - [AC_HELP_STRING([--with-hs-cpp-flags=ARG], + [AS_HELP_STRING([--with-hs-cpp-flags=ARG], [Flags to the (C) preprocessor for Haskell files [default=autodetect]])], [ if test "$HostOS" = "mingw32" @@ -2445,7 +2445,7 @@ $2=$HS_CPP_ARGS AC_DEFUN([FP_BFD_SUPPORT], [ AC_SUBST([CabalHaveLibbfd], [False]) AC_ARG_ENABLE(bfd-debug, - [AC_HELP_STRING([--enable-bfd-debug], + [AS_HELP_STRING([--enable-bfd-debug], [Enable symbol resolution for -debug rts ('+RTS -Di') via binutils' libbfd [default=no]])], [ # don't pollute general LIBS environment @@ -2457,8 +2457,8 @@ AC_DEFUN([FP_BFD_SUPPORT], [ dnl 'bfd_init' is a rare non-macro in libbfd AC_CHECK_LIB(bfd, bfd_init) - AC_TRY_LINK([#include <bfd.h>], - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <bfd.h>]], + [[ /* mimic our rts/Printer.c */ bfd* abfd; const char * name; @@ -2480,7 +2480,7 @@ AC_DEFUN([FP_BFD_SUPPORT], [ number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); bfd_get_symbol_info(abfd,symbol_table[0],&info); } - ], + ]])], [AC_SUBST([CabalHaveLibbfd], [True])],dnl bfd seems to work [AC_MSG_ERROR([can't use 'bfd' library])]) LIBS="$save_LIBS" @@ -2521,7 +2521,7 @@ AC_DEFUN([FP_CC_LINKER_FLAG_TRY], [ # AC_DEFUN([FIND_LD],[ AC_ARG_ENABLE(ld-override, - [AC_HELP_STRING([--disable-ld-override], + [AS_HELP_STRING([--disable-ld-override], [Prevent GHC from overriding the default linker used by gcc. If ld-override is enabled GHC will try to tell gcc to use whichever linker is selected by the LD environment variable. [default=override enabled]])], [], [enable_ld_override=yes]) diff --git a/configure.ac b/configure.ac index ed610f3cc1..b4dc8e250e 100644 --- a/configure.ac +++ b/configure.ac @@ -93,21 +93,21 @@ AC_ARG_WITH([ghc], AC_SUBST(WithGhc,$GHC) AC_ARG_ENABLE(bootstrap-with-devel-snapshot, -[AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot], +[AS_HELP_STRING([--enable-bootstrap-with-devel-snapshot], [Allow bootstrapping using a development snapshot of GHC. This is not guaranteed to work.])], EnableBootstrapWithDevelSnaphost=YES, EnableBootstrapWithDevelSnaphost=NO ) AC_ARG_ENABLE(tarballs-autodownload, -[AC_HELP_STRING([--enable-tarballs-autodownload], +[AS_HELP_STRING([--enable-tarballs-autodownload], [Automatically download Windows distribution binaries if needed.])], TarballsAutodownload=YES, TarballsAutodownload=NO ) AC_ARG_ENABLE(distro-toolchain, -[AC_HELP_STRING([--enable-distro-toolchain], +[AS_HELP_STRING([--enable-distro-toolchain], [Do not use bundled Windows toolchain binaries.])], EnableDistroToolchain=YES, EnableDistroToolchain=NO @@ -839,7 +839,7 @@ AC_PATH_PROG(AutoreconfCmd, autoreconf, autoreconf) dnl ** check for dtrace (currently only implemented for Mac OS X) AC_ARG_ENABLE(dtrace, - [AC_HELP_STRING([--enable-dtrace], + [AS_HELP_STRING([--enable-dtrace], [Enable DTrace])], EnableDtrace=$enableval, EnableDtrace=yes @@ -1028,7 +1028,7 @@ dnl ################################################################ # system libffi AC_ARG_WITH([system-libffi], -[AC_HELP_STRING([--with-system-libffi], +[AS_HELP_STRING([--with-system-libffi], [Use system provided libffi for RTS [default=no]]) ]) @@ -1039,7 +1039,7 @@ AS_IF([test "x$with_system_libffi" = "xyes"], AC_SUBST(UseSystemLibFFI) AC_ARG_WITH([ffi-includes], -[AC_HELP_STRING([--with-ffi-includes=ARG], +[AS_HELP_STRING([--with-ffi-includes=ARG], [Find includes for libffi in ARG [default=system default]]) ], [ @@ -1054,7 +1054,7 @@ AC_ARG_WITH([ffi-includes], AC_SUBST(FFIIncludeDir) AC_ARG_WITH([ffi-libraries], -[AC_HELP_STRING([--with-ffi-libraries=ARG], +[AS_HELP_STRING([--with-ffi-libraries=ARG], [Find libffi in ARG [default=system default]]) ], [ @@ -1125,7 +1125,7 @@ FP_CHECK_TIMER_CREATE dnl ** check for Apple's "interesting" long double compatibility scheme AC_MSG_CHECKING(for printf\$LDBLStub) -AC_TRY_LINK_FUNC(printf\$LDBLStub, +AC_LINK_IFELSE([AC_LANG_CALL([], [printf\$LDBLStub])], [ AC_MSG_RESULT(yes) AC_DEFINE([HAVE_PRINTF_LDBLSTUB],[1], @@ -1169,12 +1169,12 @@ dnl ** pthread_setname_np is a recent addition to glibc, and OS X has dnl a different single-argument version. AC_CHECK_LIB(pthread, pthread_setname_np) AC_MSG_CHECKING(for pthread_setname_np) -AC_TRY_LINK( -[ +AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[ #define _GNU_SOURCE #include <pthread.h> -], -[pthread_setname_np(pthread_self(), "name");], +]], +[[pthread_setname_np(pthread_self(), "name");]])], AC_MSG_RESULT(yes) AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define to 1 if you have the glibc version of pthread_setname_np]), @@ -1213,7 +1213,7 @@ dnl VirtualAlloc MEM_RESERVE 1099512676352 bytes failed: The paging file is t dnl AC_ARG_ENABLE(large-address-space, - [AC_HELP_STRING([--enable-large-address-space], + [AS_HELP_STRING([--enable-large-address-space], [Use a single large address space on 64 bit systems (enabled by default on 64 bit platforms)])], EnableLargeAddressSpace=$enableval, EnableLargeAddressSpace=yes @@ -1271,7 +1271,7 @@ AC_DEFINE_UNQUOTED([RTS_LINKER_USE_MMAP], [$RtsLinkerUseMmap], dnl ** Have libdw? dnl -------------------------------------------------------------- AC_ARG_WITH([libdw-libraries], - [AC_HELP_STRING([--with-libdw-libraries=ARG], + [AS_HELP_STRING([--with-libdw-libraries=ARG], [Find libraries for libdw in ARG [default=system default]]) ], [ @@ -1282,7 +1282,7 @@ AC_ARG_WITH([libdw-libraries], AC_SUBST(LibdwLibDir) AC_ARG_WITH([libdw-includes], - [AC_HELP_STRING([--with-libdw-includes=ARG], + [AS_HELP_STRING([--with-libdw-includes=ARG], [Find includes for libdw in ARG [default=system default]]) ], [ @@ -1295,7 +1295,7 @@ AC_SUBST(LibdwIncludeDir) UseLibdw=NO USE_LIBDW=0 AC_ARG_ENABLE(dwarf-unwind, - [AC_HELP_STRING([--enable-dwarf-unwind], + [AS_HELP_STRING([--enable-dwarf-unwind], [Enable DWARF unwinding support in the runtime system via elfutils' libdw [default=no]])]) if test "$enable_dwarf_unwind" = "yes" ; then CFLAGS2="$CFLAGS" @@ -1324,7 +1324,7 @@ AC_DEFINE_UNQUOTED([USE_LIBDW], [$USE_LIBDW], [Set to 1 to use libdw]) dnl ** Have libnuma? dnl -------------------------------------------------------------- AC_ARG_WITH([libnuma-libraries], - [AC_HELP_STRING([--with-libnuma-libraries=ARG], + [AS_HELP_STRING([--with-libnuma-libraries=ARG], [Find libraries for libnuma in ARG [default=system default]]) ], [ @@ -1335,7 +1335,7 @@ AC_ARG_WITH([libnuma-libraries], AC_SUBST(LibNumaLibDir) AC_ARG_WITH([libnuma-includes], - [AC_HELP_STRING([--with-libnuma-includes=ARG], + [AS_HELP_STRING([--with-libnuma-includes=ARG], [Find includes for libnuma in ARG [default=system default]]) ], [ @@ -1347,7 +1347,7 @@ AC_SUBST(LibNumaIncludeDir) HaveLibNuma=0 AC_ARG_ENABLE(numa, - [AC_HELP_STRING([--enable-numa], + [AS_HELP_STRING([--enable-numa], [Enable NUMA memory policy and thread affinity support in the runtime system via numactl's libnuma [default=auto]])]) |