make installed header files independent of configure options

We want to share most of the header files among the different CLooG instantiations. In particular, we don't want an install of a non-gmp cloog-polylib to render any cloog-isl unusable, or vice versa. The down-side is that we require users of CLooG to specify the integer type used inside the CLooG library they want to use by defining one of CLOOG_INT_INT, CLOOG_INT_LONG, CLOOG_INT_LONG_LONG or CLOOG_INT_GMP, but we will somewhat alleviate this in the next commit. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
PapyChacal · Jan 26, 2010 · 5bacff0 · 5bacff0
1 parent 0cfa918
commit 5bacff0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -102,6 +102,7 @@ pkginclude_HEADERS = \
 	include/cloog/block.h \
 	include/cloog/clast.h \
 	include/cloog/cloog.h \
+	include/cloog/int.h \
 	include/cloog/matrix.h \
 	include/cloog/state.h \
 	include/cloog/domain.h \
@@ -113,8 +114,6 @@ pkginclude_HEADERS = \
 	include/cloog/program.h \
 	include/cloog/statement.h \
 	include/cloog/version.h
-nodist_pkginclude_HEADERS = \
-	include/cloog/int.h
 
 pkgmatrixincludedir = $(pkgincludedir)/matrix
 pkgmatrixinclude_HEADERS = \

diff --git a/autogen.sh b/autogen.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 libtoolize -c --force
 aclocal -I m4
-autoheader
 automake -a -c --foreign
 autoconf
 if test -f isl/autogen.sh; then

diff --git a/configure.in b/configure.in
@@ -271,6 +271,10 @@ case "$BITS" in
 		done
 		;;
 esac
+AH_TEMPLATE(CLOOG_INT_INT)
+AH_TEMPLATE(CLOOG_INT_LONG)
+AH_TEMPLATE(CLOOG_INT_LONG_LONG)
+AH_TEMPLATE(CLOOG_INT_GMP)
 AC_DEFINE_UNQUOTED(AS_TR_CPP(CLOOG_INT_$cl_cv_int_type))
 
 AC_SUBST(GIT_INDEX)
@@ -296,9 +300,6 @@ AC_SUBST(INSTALL)
 
 AC_SUBST(BITS)
 
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_HEADERS(include/cloog/int.h)
-AC_CONFIG_HEADERS(include/cloog/options.h)
 AC_CONFIG_FILES(Makefile test/Makefile include/cloog/polylib/backend.h)
 AC_CONFIG_FILES(autoconf/Doxyfile)
 AC_CONFIG_FILES(doc/Makefile)

diff --git a/include/cloog/int.h.in → include/cloog/int.h b/include/cloog/int.h.in → include/cloog/int.h
@@ -1,11 +1,6 @@
 #ifndef CLOOG_INT_H
 #define CLOOG_INT_H
 
-#undef CLOOG_INT_INT
-#undef CLOOG_INT_LONG
-#undef CLOOG_INT_LONG_LONG
-#undef CLOOG_INT_GMP
-
 #include <assert.h>
 #include <stdio.h>
 #if defined(CLOOG_INT_GMP)

diff --git a/include/cloog/isl/cloog.h b/include/cloog/isl/cloog.h
@@ -1,6 +1,10 @@
 #ifndef CLOOG_ISL_H
 #define CLOOG_ISL_H
 
+#ifndef CLOOG_INT_GMP
+#define CLOOG_INT_GMP
+#endif
+
 #include <cloog/cloog.h>
 #include <cloog/isl/constraintset.h>
 #include <cloog/isl/domain.h>

diff --git a/include/cloog/options.h.in → include/cloog/options.h b/include/cloog/options.h.in → include/cloog/options.h
@@ -49,7 +49,6 @@ extern "C"
 #define CLOOG_MEMORY 
  */
 #define CLOOG_SCALARS
-#undef CLOOG_RUSAGE
 
 struct cloogoptions;
 typedef struct cloogoptions CloogOptions;
@@ -91,9 +90,7 @@ struct cloogoptions
 
   /* MISC OPTIONS */
   char * name ;   /* Name of the input file. */
-#ifdef CLOOG_RUSAGE
   float time ;    /* Time spent for code generation in seconds. */
-#endif
 #ifdef CLOOG_MEMORY
   int memory ;    /* Memory spent for code generation in kilobytes. */
 #endif