[commit: ghc] wip/ghc-8.8-merges: Fix incorrectly named configure options (4d778c7)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/ghc-8.8-merges
Link       : http://ghc.haskell.org/trac/ghc/changeset/4d778c7f4b39645ad55bf12fbe1fedc40f52be25/ghc

>---------------------------------------------------------------

commit 4d778c7f4b39645ad55bf12fbe1fedc40f52be25
Author: Alec Theriault <alec.theriault at gmail.com>
Date:   Sat Jan 26 18:07:48 2019 -0800

    Fix incorrectly named configure options
    
    Although we should use 'AC_ARG_ENABLE' for boolean flags, it also
    means options get named '--enable-*', not '--with-*'. This should
    unbreak the --with-intree-gmp option.
    
    (cherry picked from commit b89b6e71c798996724ba99f273f88d8a3637fb8d)


>---------------------------------------------------------------

4d778c7f4b39645ad55bf12fbe1fedc40f52be25
 aclocal.m4                         | 4 ++--
 libraries/integer-gmp/configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 62825c3..9d2390e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1780,13 +1780,13 @@ AC_DEFUN([FP_GMP],
       [directory containing gmp library])],
       [GMP_LIB_DIRS=$withval])
 
-  AC_ARG_ENABLE([intree-gmp],
+  AC_ARG_WITH([intree-gmp],
     [AC_HELP_STRING([--with-intree-gmp],
       [force using the in-tree GMP])],
       [GMP_FORCE_INTREE=YES],
       [GMP_FORCE_INTREE=NO])
 
-  AC_ARG_ENABLE([gmp-framework-preferred],
+  AC_ARG_WITH([gmp-framework-preferred],
     [AC_HELP_STRING([--with-gmp-framework-preferred],
       [on OSX, prefer the GMP framework to the gmp lib])],
       [GMP_PREFER_FRAMEWORK=YES],
diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac
index d189375..1ccd48e 100644
--- a/libraries/integer-gmp/configure.ac
+++ b/libraries/integer-gmp/configure.ac
@@ -27,13 +27,13 @@ AC_ARG_WITH([gmp-libraries],
     [GMP_LIB_DIRS=$withval; LDFLAGS="-L$withval"],
     [GMP_LIB_DIRS=])
 
-AC_ARG_ENABLE([gmp-framework-preferred],
+AC_ARG_WITH([gmp-framework-preferred],
   [AC_HELP_STRING([--with-gmp-framework-preferred],
     [on OSX, prefer the GMP framework to the gmp lib])],
     [GMP_PREFER_FRAMEWORK=YES],
     [GMP_PREFER_FRAMEWORK=NO])
 
-AC_ARG_ENABLE([intree-gmp],
+AC_ARG_WITH([intree-gmp],
   [AC_HELP_STRING([--with-intree-gmp],
     [force using the in-tree GMP])],
     [GMP_FORCE_INTREE=YES],