From ff1ea6be3fdafe036160fb8b66038957488eb58a Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Wed, 13 Jan 2010 09:59:16 +0100
Subject: [PATCH] properly remove piplib submodule

309036c (add copyright statements) accidentally removed the piplib submodule.
Removing the piplib submodule was not a bad idea since we don't really need it
anymore, but it should be done properly.
---
 Makefile.am  | 13 +++----------
 autogen.sh   |  3 ---
 configure.ac | 10 +---------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 332978d..24dde76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
-if BUNDLED_PIPLIB
-MAYBE_PIPLIB = piplib
-endif
-
-SUBDIRS = $(MAYBE_PIPLIB) . doc
-DIST_SUBDIRS = $(MAYBE_PIPLIB) doc
+SUBDIRS = . doc
+DIST_SUBDIRS = doc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -26,9 +22,6 @@ ISL_PIPLIB = \
 	isl_map_no_piplib.c \
 	isl_sample_no_piplib.c
 endif
-if BUNDLED_PIPLIB
-PIPLIB_LA = $(top_builddir)/piplib/libpiplibMP.la
-endif
 
 if NEED_GET_MEMORY_FUNCTIONS
 GET_MEMORY_FUNCTIONS=mp_get_memory_functions.c
@@ -90,7 +83,7 @@ EXTRA_libisl_la_SOURCES = \
 	isl_sample_piplib.c \
 	isl_sample_piplib.h \
 	isl_piplib.c
-libisl_la_LIBADD = $(PIPLIB_LA) @PIPLIB_LIBS@ -lgmp
+libisl_la_LIBADD = @PIPLIB_LIBS@ -lgmp
 libisl_la_LDFLAGS = -version-info @versioninfo@ \
 	@PIPLIB_LDFLAGS@ @GMP_LDFLAGS@
 libisl_la_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \
diff --git a/autogen.sh b/autogen.sh
index 9b8498a..4250cc4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,3 @@ aclocal -I m4
 autoheader
 automake -a -c --foreign
 autoconf
-if test -f piplib/autogen.sh; then
-	(cd piplib; ./autogen.sh)
-fi
diff --git a/configure.ac b/configure.ac
index 4c5e747..a92c651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,17 +38,13 @@ AC_CHECK_DECLS(mp_get_memory_functions,[],[
 CPPFLAGS="$SAVE_CPPFLAGS"
 AM_CONDITIONAL(NEED_GET_MEMORY_FUNCTIONS, test x$need_get_memory_functions = xtrue)
 
-AX_SUBMODULE(piplib,no|system|build|bundled,no)
+AX_SUBMODULE(piplib,no|system|build,no)
 
 have_piplib=false
 AC_SUBST(PIPLIB_CPPFLAGS)
 AC_SUBST(PIPLIB_LDFLAGS)
 AC_SUBST(PIPLIB_LIBS)
 case "$with_piplib" in
-	bundled)
-		PIPLIB_CPPFLAGS="-I$srcdir/piplib/include"
-		isl_configure_args="$isl_configure_args --with-bits=gmp"
-	;;
 	build)
 		PIPLIB_CPPFLAGS="-I$piplib_srcdir/include"
 		PIPLIB_LIBS="$with_piplib_builddir/libpiplibMP.la"
@@ -84,7 +80,6 @@ if test "$with_piplib" != "no"; then
 	have_piplib=true
 fi
 AM_CONDITIONAL(HAVE_PIPLIB, test x$have_piplib = xtrue)
-AM_CONDITIONAL(BUNDLED_PIPLIB, test $with_piplib = bundled)
 
 PACKAGE_CFLAGS="-I$prefix/include/isl"
 AX_CREATE_PKGCONFIG_INFO
@@ -93,9 +88,6 @@ AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_HEADERS(include/isl_config.h)
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(doc/Makefile)
-if test $with_piplib = bundled; then
-	AC_CONFIG_SUBDIRS(piplib)
-fi
 AC_CONFIG_COMMANDS_POST([
 	dnl pass on arguments to subdir configures, but don't
 	dnl add them to config.status
-- 
2.7.4