From 4892a11738aaaf84aa1259b3b3b186dee52ac0b4 Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Tue, 10 Apr 2012 13:10:34 +0200
Subject: [PATCH] drop cloog submodule

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
 .gitmodules  |  3 ---
 Makefile.am  | 14 +++-----------
 autogen.sh   |  3 ---
 cloog        |  1 -
 configure.ac | 32 --------------------------------
 version.c    |  5 -----
 6 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 160000 cloog

diff --git a/.gitmodules b/.gitmodules
index d65ced4..119bfc0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "isl-polylib"]
 	path = isl-polylib
 	url = git://repo.or.cz/isl-polylib.git
-[submodule "cloog"]
-	path = cloog
-	url = git://repo.or.cz/cloog.git
 [submodule "pet"]
 	path = pet
 	url = git://repo.or.cz/pet.git
diff --git a/Makefile.am b/Makefile.am
index b40dc6c..b274576 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,10 +22,6 @@ if BUNDLED_ISL_POLYLIB
     MAYBE_ISL_POLYLIB = isl-polylib
     ISL_POLYLIB_LA = $(top_builddir)/isl-polylib/libisl-polylib.la
 endif
-if BUNDLED_CLOOG
-    MAYBE_CLOOG = cloog
-    CLOOG_LA = $(top_builddir)/cloog/libcloog-isl.la
-endif
 if USE_ZSOLVE
     MAYBE_ZSOLVE = zsolve
 endif
@@ -33,10 +29,9 @@ if USE_PARKER
     MAYBE_PARKER = parker
 endif
 SUBDIRS = $(MAYBE_POLYLIB) $(MAYBE_ISL) $(MAYBE_PET) $(MAYBE_ISL_POLYLIB) \
-		$(MAYBE_CLOOG) \
 		$(MAYBE_ZSOLVE) $(MAYBE_PARKER) . doc
 DIST_SUBDIRS = $(MAYBE_POLYLIB) $(MAYBE_ISL) $(MAYBE_PET) \
-		$(MAYBE_ISL_POLYLIB) $(MAYBE_CLOOG) \
+		$(MAYBE_ISL_POLYLIB) \
 		zsolve parker doc
 
 FORCE:
@@ -48,8 +43,6 @@ pet/libpet.la: FORCE
 	cd pet; $(MAKE) $(AM_MAKEFLAGS) libpet.la
 isl-polylib/libisl-polylib.la: $(LOCAL_ISL_LA) $(LOCAL_POLYLIB_LA) FORCE
 	cd isl-polylib; $(MAKE) $(AM_MAKEFLAGS) libisl-polylib.la
-cloog/libcloog-isl.la: $(LOCAL_ISL_LA) FORCE
-	cd cloog; $(MAKE) $(AM_MAKEFLAGS) libcloog-isl.la
 zsolve/libzsolve.la: FORCE
 	cd zsolve; $(MAKE) $(AM_MAKEFLAGS) libzsolve.la
 parker/libparker.la: FORCE
@@ -62,7 +55,6 @@ AM_LDFLAGS = @POLYLIB_LDFLAGS@ @NTL_LDFLAGS@
 LIB_ISL = $(ISL_LA) @ISL_LIBS@
 LIB_PET = $(PET_LA) @PET_LIBS@
 LIB_ISL_POLYLIB = $(ISL_POLYLIB_LA) @ISL_POLYLIB_LIBS@
-LIB_CLOOG = $(CLOOG_LA) @CLOOG_LIBS@
 LIB_POLYLIB = $(POLYLIB_LA) @POLYLIB_LIBS@
 
 lib_LTLIBRARIES = libbarvinok.la
@@ -334,9 +326,9 @@ iscc_SOURCES =	\
 	isl_obj_str.h \
 	isl_obj_str.c \
 	iscc.c
-iscc_CPPFLAGS = @PET_CFLAGS@ @CLOOG_CFLAGS@ $(AM_CPPFLAGS)
+iscc_CPPFLAGS = @PET_CFLAGS@ $(AM_CPPFLAGS)
 iscc_LDADD = \
-	libbarvinok.la $(LIB_CLOOG) $(LIB_ISL_POLYLIB) $(LIB_PET) $(LIB_ISL) \
+	libbarvinok.la $(LIB_ISL_POLYLIB) $(LIB_PET) $(LIB_ISL) \
 	$(LIB_POLYLIB)
 
 isl.py: interface/isl.py.top
diff --git a/autogen.sh b/autogen.sh
index bf230e3..86a7731 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,6 +12,3 @@ fi
 if test -f isl-polylib/autogen.sh; then
 	(cd isl-polylib; ./autogen.sh)
 fi
-if test -f cloog/autogen.sh; then
-	(cd cloog; ./autogen.sh)
-fi
diff --git a/cloog b/cloog
deleted file mode 160000
index 57470e7..0000000
--- a/cloog
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57470e76bfd58a0c38c598e816411663193e0f45
diff --git a/configure.ac b/configure.ac
index 65a5003..602275b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,35 +458,6 @@ if test "$topcom_package" != no; then
 fi
 AM_CONDITIONAL(HAVE_TOPCOM, test x$have_topcom = xtrue)
 
-AX_SUBMODULE(cloog,no|build|bundled|system,bundled)
-
-AC_SUBST(CLOOG_LDFLAGS)
-AC_SUBST(CLOOG_CFLAGS)
-AC_SUBST(CLOOG_LIBS)
-CLOOG_CFLAGS="-DCLOOG_INT_GMP=1"
-case "$with_cloog" in
-bundled)
-	CLOOG_CFLAGS="$CLOOG_CFLAGS -I\$(top_srcdir)/cloog/include -I\$(top_builddir)/cloog/include"
-	AC_DEFINE(HAVE_CLOOG,[],[use CLooG])
-	;;
-build)
-	with_cloog_builddir=`echo @abs_builddir@ | $with_cloog_builddir/config.status --file=-`
-	CLOOG_CFLAGS="$CLOOG_CFLAGS -I$cloog_srcdir/include -I$with_cloog_builddir/include"
-	CLOOG_LIBS="$with_cloog_builddir/libcloog-isl.la"
-	AC_DEFINE(HAVE_CLOOG,[],[use CLooG])
-	;;
-system)
-	if test "x$with_cloog_prefix" != "x"; then
-		CLOOG_CFLAGS="$CLOOG_CFLAGS -I$with_cloog_prefix/include"
-	fi
-	if test "x$with_cloog_exec_prefix" != "x"; then
-		CLOOG_LDFLAGS="-L$with_cloog_exec_prefix/lib"
-	fi
-	CLOOG_LIBS="-lcloog-isl"
-	AC_DEFINE(HAVE_CLOOG,[],[use CLooG])
-esac
-AM_CONDITIONAL(BUNDLED_CLOOG, test $with_cloog = bundled)
-
 AC_SUBST(GIT_HEAD_ID)
 AC_SUBST(GIT_HEAD)
 AC_SUBST(GIT_HEAD_VERSION)
@@ -558,9 +529,6 @@ fi
 if test $with_isl_polylib = bundled; then
 	AC_CONFIG_SUBDIRS(isl-polylib)
 fi
-if test $with_cloog = bundled; then
-	AC_CONFIG_SUBDIRS(cloog)
-fi
 AC_CONFIG_COMMANDS_POST([
 	dnl pass on arguments to subdir configures, but don't
 	dnl add them to config.status
diff --git a/version.c b/version.c
index 8385dd4..8c2b321 100644
--- a/version.c
+++ b/version.c
@@ -39,11 +39,6 @@ const char *barvinok_version(void)
 #else
 	" -GLPK"
 #endif
-#ifdef HAVE_CLOOG
-	" +CLOOG"
-#else
-	" -CLOOG"
-#endif
 #ifdef POINTS2TRIANGS_PATH
 	" +TOPCOM"
 #else
-- 
2.11.4.GIT