From f118f70e02fffe18c105c2fa7dbf37572307f7bb Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Tue, 30 Jul 2013 15:38:08 +0200
Subject: [PATCH] configure.ac: remove explicit dependence on gmp

Now that isl no longer exports its dependence on gmp, we no longer
have to set the gmp include path or explicitly link in gmp.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
 Makefile.am  |  2 +-
 configure.ac | 24 +++---------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b5e2534..0f59939 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 if BUNDLED_ISL
     MAYBE_ISL = isl
-    ISL_LA = $(top_builddir)/isl/libisl.la @GMP_LDFLAGS@ @GMP_LIBS@
+    ISL_LA = $(top_builddir)/isl/libisl.la
 endif
 
 SUBDIRS = $(MAYBE_ISL) .
diff --git a/configure.ac b/configure.ac
index 18c4069..b051f36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,24 +139,6 @@ AC_SUBST(LIB_CLANG_EDIT)
 AC_CHECK_LIB([clangEdit], [main], [LIB_CLANG_EDIT=-lclangEdit], [])
 LDFLAGS="$SAVE_LDFLAGS"
 
-AX_SUBMODULE(gmp,system|build,system)
-
-AC_SUBST(GMP_LDFLAGS)
-AC_SUBST(GMP_LIBS)
-case "$with_gmp" in
-system)
-	if test "x$with_gmp_prefix" != "x"; then
-		GMP_CPPFLAGS="-I$with_gmp_prefix/include"
-		GMP_LDFLAGS="-L$with_gmp_prefix/lib"
-	fi
-	GMP_LIBS=-lgmp
-	;;
-build)
-	GMP_CPPFLAGS="-I$gmp_srcdir -I$with_gmp_builddir"
-	GMP_LIBS="$with_gmp_builddir/libgmp.la"
-	;;
-esac
-
 AX_SUBMODULE(isl,build|bundled|system,bundled)
 AM_CONDITIONAL(BUNDLED_ISL, test $with_isl = bundled)
 
@@ -166,15 +148,15 @@ AC_SUBST(ISL_SRCDIR)
 case "$with_isl" in
 bundled)
 	ISL_CFLAGS="-I\$(top_srcdir)/isl/include -I\$(top_builddir)/isl/include"
-	ISL_CFLAGS="$ISL_CFLAGS $GMP_CPPFLAGS"
+	ISL_CFLAGS="$ISL_CFLAGS"
 	ISL_SRCDIR="$srcdir/isl"
 	;;
 build)
 	ISL_SRCDIR="$isl_srcdir"
 	ISL_BUILDDIR=`echo @abs_builddir@ | $with_isl_builddir/config.status --file=-`
 	ISL_CFLAGS="-I$isl_srcdir/include -I$ISL_BUILDDIR/include"
-	ISL_CFLAGS="$ISL_CFLAGS $GMP_CPPFLAGS"
-	ISL_LIBS="$with_isl_builddir/libisl.la $GMP_LDFLAGS $GMP_LIBS"
+	ISL_CFLAGS="$ISL_CFLAGS"
+	ISL_LIBS="$with_isl_builddir/libisl.la"
 	;;
 system)
 	PKG_CHECK_MODULES([ISL], [isl])
-- 
2.11.4.GIT