Fix typo (HAVE_LIBGMP => HAVE_LIB_GMP); omit local gmp includes if HAVE_LIB_GMP

If we're using the system's installed GMP, we don't want to be picking
up the local gmp.h header file.

Fixes 2469(ghci) for me, because it turns out the system's GMP is more
up-to-date than GHC's version and has a fix for more recent versions
of gcc.  We also need to pull in a more recent GMP, but that's a
separte issue.

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 318f4ed..be9451f 100644 (file)
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -22,7 +22,7 @@ library-dirs:         LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
 # endif
 #else /* !INSTALLING */
 library-dirs:          FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
                        , FPTOOLS_TOP_ABS"/gmp"
 # endif
 #endif
@@ -62,7 +62,9 @@ include-dirs:         INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
 #else /* !INSTALLING */
 include-dirs:          FPTOOLS_TOP_ABS"/includes"
                        FPTOOLS_TOP_ABS"/rts"
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
                        FPTOOLS_TOP_ABS"/gmp/gmpbuild"
+# endif
                        GMP_INCLUDE_DIRS
 #endif