From 08ce5adfcf38a3a2910b9864da3aff36836da746 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Mon, 4 Jun 2012 13:17:47 +0200 Subject: [PATCH] configure.ac: allow specification of gmp location When using the bundled isl, we need to set the include path for the gmp headers (if installed in a non-standard location). Signed-off-by: Sven Verdoolaege --- Makefile.am | 2 +- configure.ac | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8ebf60a..1c4ddd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ if BUNDLED_ISL MAYBE_ISL = isl - ISL_LA = $(top_builddir)/isl/libisl.la -lgmp + ISL_LA = $(top_builddir)/isl/libisl.la @GMP_LDFLAGS@ @GMP_LIBS@ endif SUBDIRS = $(MAYBE_ISL) . diff --git a/configure.ac b/configure.ac index 58e5e38..15f7edf 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,24 @@ 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) @@ -88,11 +106,13 @@ AC_SUBST(ISL_LIBS) case "$with_isl" in bundled) ISL_CFLAGS="-I\$(top_srcdir)/isl/include -I\$(top_builddir)/isl/include" + ISL_CFLAGS="$ISL_CFLAGS $GMP_CPPFLAGS" ;; build) ISL_BUILDDIR=`echo @abs_builddir@ | $with_isl_builddir/config.status --file=-` ISL_CFLAGS="-I$isl_srcdir/include -I$ISL_BUILDDIR/include" - ISL_LIBS="$with_isl_builddir/libisl.la -lgmp" + ISL_CFLAGS="$ISL_CFLAGS $GMP_CPPFLAGS" + ISL_LIBS="$with_isl_builddir/libisl.la $GMP_LDFLAGS $GMP_LIBS" ;; system) PKG_CHECK_MODULES([ISL], [isl]) -- 2.11.4.GIT