Revert "build: support a system CUDD installation (#48)"

This reverts commit 47f2a14.
BRiAl · Oct 1, 2020 · 67a0ce7 · 67a0ce7 · jengelh · Oct 1, 2020
1 parent d4dead9
commit 67a0ce7
Show file tree

Hide file tree

Showing 27 changed files with 76 additions and 52 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,15 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =
-if !EXTERNAL_CUDD
-SUBDIRS += cudd
-endif
-SUBDIRS += libbrial . groebner tests
+SUBDIRS = cudd libbrial . groebner tests
 
 lib_LTLIBRARIES = libbrial.la
 
 libbrial_la_SOURCES =
-libbrial_la_LIBADD = libbrial/src/libbrial_base.la ${CUDD_LIBS}
+libbrial_la_LIBADD = \
+	cudd/libcudd.la \
+	libbrial/src/libbrial_base.la
 libbrial_la_LDFLAGS = -no-undefined $(AM_LDFLAGS) -version-info @LT_CURRENT@:@LT_REVISION@:@LT_AGE@
 
 EXTRA_DIST = \

diff --git a/common.mk b/common.mk
@@ -1,8 +1,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/groebner/include \
 	-I$(top_builddir)/libbrial/include \
-	-I$(top_srcdir)/libbrial/include \
-	${CUDD_CPPFLAGS}
+	-I$(top_srcdir)/libbrial/include
 
 AM_CXXFLAGS = -ftemplate-depth-100
 

diff --git a/configure.ac b/configure.ac
@@ -95,24 +95,6 @@ else
     fi
 fi
 
-EXTERNAL_CUDD=""
-AC_ARG_WITH([external-cudd],
-	[AS_HELP_STRING([--with-external-cudd], [Utilize a system-installed CUDD library])],
-	[
-		CUDD_CPPFLAGS="-DPBORI_USE_ORIGINAL_CUDD"
-		AC_CHECK_HEADERS([cudd/cuddInt.h], [], [AC_MSG_ERROR([Requested system CUDD but cannot resolve <cudd/cuddInt.h>])])
-		CUDD_LIBS="-lcudd"
-		EXTERNAL_CUDD=1
-	],
-	[
-		CUDD_CPPFLAGS='-I${top_srcdir}/libbrial/include/polybori'
-		CUDD_LIBS='${top_builddir}/cudd/libcudd.la'
-	]
-)
-AM_CONDITIONAL([EXTERNAL_CUDD], [test -n "$EXTERNAL_CUDD"])
-AC_SUBST([CUDD_CPPFLAGS])
-AC_SUBST([CUDD_LIBS])
-
 AC_CONFIG_HEADERS([config_dummy.h libbrial/include/polybori/config.h])
 AC_CONFIG_FILES([
                  Makefile

diff --git a/cudd/cudd.h b/cudd/cudd.h
@@ -72,7 +72,7 @@
 
 #else
 #include <polybori/config.h>
-#include <polybori/cuddaux/prefix.h>
+#include <polybori/cudd/prefix.h>
 
 #ifndef CUDD_ASSERT
 

diff --git a/cudd/cuddAPI.c b/cudd/cuddAPI.c
@@ -213,7 +213,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddCache.c b/cudd/cuddCache.c
@@ -67,7 +67,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddInit.c b/cudd/cuddInit.c
@@ -60,7 +60,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddInt.h b/cudd/cuddInt.h
@@ -92,7 +92,7 @@
 #include "st.h"
 
 #else 
-#include <polybori/cuddaux/prefix.h>
+#include <polybori/cudd/prefix.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/cudd/cuddLCache.c b/cudd/cuddLCache.c
@@ -79,7 +79,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddRef.c b/cudd/cuddRef.c
@@ -69,7 +69,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddTable.c b/cudd/cuddTable.c
@@ -85,7 +85,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddZddFuncs.c b/cudd/cuddZddFuncs.c
@@ -79,7 +79,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/cuddZddSetop.c b/cudd/cuddZddSetop.c
@@ -77,7 +77,7 @@
 #include "cuddInt.h"
 
 #ifndef PBORI_FORCE_ORIGINAL_CUDD
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/prefix_internal.h>
 #endif
 
 /*---------------------------------------------------------------------------*/

diff --git a/cudd/util.h b/cudd/util.h
@@ -8,7 +8,7 @@
 #ifndef polybori_cuddy_util_h_
 #define polybori_cuddy_util_h_
 
-#include <polybori/cuddaux/prefix.h>
+#include <polybori/cudd/prefix.h>
 #ifdef __cplusplus
 
 #include <ctime>

diff --git a/libbrial/include/Makefile.am b/libbrial/include/Makefile.am
@@ -21,8 +21,8 @@ nobase_include_HEADERS = \
 	polybori/common/traits.h \
 	polybori/common/TransformedSequence.h \
 	polybori/config.h \
-	polybori/cuddaux/prefix.h \
-	polybori/cuddaux/prefix_internal.h \
+	polybori/cudd/prefix.h \
+	polybori/cudd/prefix_internal.h \
 	polybori/DegLexOrder.h \
 	polybori/DegRevLexAscOrder.h \
 	polybori/diagram/CApplyNodeFacade.h \
@@ -81,3 +81,7 @@ nobase_include_HEADERS = \
 	polybori/routines/pbori_routines_misc.h \
 	polybori/routines/pbori_routines_order.h \
 	polybori.h
+
+noinst_HEADERS = \
+	polybori/cudd/cudd.h \
+	polybori/cudd/cuddInt.h
diff --git a/libbrial/include/polybori/common/traits.h b/libbrial/include/polybori/common/traits.h
@@ -22,7 +22,6 @@
 // include basic definitions
 #include <polybori/pbori_defs.h>
 #include <polybori/common/tags.h>
-#include <polybori/cuddaux/prefix.h>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>

diff --git a/libbrial/include/polybori/cudd/cudd.h b/libbrial/include/polybori/cudd/cudd.h
@@ -0,0 +1,22 @@
+// -*- c++ -*-
+//*****************************************************************************
+/** @file cudd.h
+ *
+ * @author Alexander Dreyer
+ * @date 2001-07-13
+ *
+ * Forwarding header for cudd.h
+ * (PolyBoRi needs a specific version of Cudd.)
+ *
+ * @par Copyright:
+ *   (c) 2011 by The PolyBoRi Team
+ *
+**/
+//*****************************************************************************
+
+#ifndef polybori_cudd_cudd_h_
+#define polybori_cudd_cudd_h_
+
+#include "../../../../cudd/cudd.h"
+
+#endif
diff --git a/libbrial/include/polybori/cudd/cuddInt.h b/libbrial/include/polybori/cudd/cuddInt.h
@@ -0,0 +1,22 @@
+// -*- c++ -*-
+//*****************************************************************************
+/** @file cudd.h
+ *
+ * @author Alexander Dreyer
+ * @date 2001-07-13
+ *
+ * Forwarding header for cuddInt.h
+ * (PolyBoRi needs a specific version of Cudd.)
+ *
+ * @par Copyright:
+ *   (c) 2011 by The PolyBoRi Team
+ *
+**/
+//*****************************************************************************
+
+#ifndef polybori_cudd_cuddInt_h_
+#define polybori_cudd_cuddInt_h_
+
+#include "../../../../cudd/cuddInt.h"
+
+#endif
diff --git a/libbrial/include/polybori/cuddaux/prefix.h → libbrial/include/polybori/cudd/prefix.h b/libbrial/include/polybori/cuddaux/prefix.h → libbrial/include/polybori/cudd/prefix.h
diff --git a/...nclude/polybori/cuddaux/prefix_internal.h → ...l/include/polybori/cudd/prefix_internal.h b/...nclude/polybori/cuddaux/prefix_internal.h → ...l/include/polybori/cudd/prefix_internal.h
diff --git a/libbrial/include/polybori/diagram/CCuddDDFacade.h b/libbrial/include/polybori/diagram/CCuddDDFacade.h
@@ -19,8 +19,8 @@
 // include basic definitions
 #include <polybori/pbori_defs.h>
 
-#include <cudd/cudd.h>
-#include <polybori/cuddaux/prefix.h>
+#include <polybori/cudd/cudd.h>
+#include <polybori/cudd/prefix.h>
 #include "CApplyNodeFacade.h"
 #include "CNodeCounter.h"
 

diff --git a/libbrial/include/polybori/diagram/CDDOperations.h b/libbrial/include/polybori/diagram/CDDOperations.h
@@ -19,7 +19,7 @@
 #include <polybori/pbori_defs.h>
 
 // Get Cudd definitions
-#include <cudd/cudd.h>
+#include <polybori/cudd/cudd.h>
 
 #include <polybori/routines/pbori_routines.h>
 #include <polybori/cache/CCacheManagement.h>

diff --git a/libbrial/include/polybori/pbori_defs.h b/libbrial/include/polybori/pbori_defs.h
@@ -24,7 +24,7 @@
 #include <iostream>
 
 /// @note PolyBoRi comes with a special copy of Cudd
-#include <cudd/cudd.h>
+#include <polybori/cudd/cudd.h>
 
 #include "config.h"
 

diff --git a/libbrial/include/polybori/ring/CCuddInterface.h b/libbrial/include/polybori/ring/CCuddInterface.h
@@ -19,9 +19,8 @@
 // include basic definitions
 #include <polybori/pbori_defs.h>
 
-#include <cudd/cudd.h>
-#include <cudd/cuddInt.h>
-#include <polybori/cuddaux/prefix.h>
+#include <polybori/cudd/cudd.h>
+#include <polybori/cudd/cuddInt.h>
 
 #include <polybori/routines/pbori_func.h>         // handle_error
 #include "CCallbackWrapper.h"

diff --git a/libbrial/include/polybori/routines/pbori_algo.h b/libbrial/include/polybori/routines/pbori_algo.h
@@ -27,8 +27,7 @@
 #include <polybori/common/traits.h>
 
 // temporarily
-#include <cudd/cudd.h>
-#include <polybori/cuddaux/prefix.h>
+#include <polybori/cudd/cudd.h>
 #include <polybori/ring/CCuddInterface.h>
 
 BEGIN_NAMESPACE_PBORI

diff --git a/libbrial/include/polybori/routines/pbori_algo_int.h b/libbrial/include/polybori/routines/pbori_algo_int.h
@@ -22,7 +22,7 @@
 // get polybori's functionals
 #include "pbori_func.h"
 #include <polybori/iterators/CCuddNavigator.h>
-#include <cudd/cudd.h>
+#include <polybori/cudd/cudd.h>
 
 BEGIN_NAMESPACE_PBORI
 

diff --git a/libbrial/src/pbori_routines.cc b/libbrial/src/pbori_routines.cc
@@ -15,8 +15,8 @@
 // include basic definitions
 #include <polybori/pbori_defs.h>
 
-#include <cudd/cudd.h>
-#include <polybori/cuddaux/prefix_internal.h>
+#include <polybori/cudd/cudd.h>
+#include <polybori/cudd/prefix_internal.h>
 
 BEGIN_NAMESPACE_PBORI