Merging patches

parent 2ad3ffca
From: Leopold Palomo-Avellaneda <leopold.palomo@upc.edu>
Date: Tue, 13 Oct 2015 15:02:53 +0200
Subject: Patch to solve autoreconf issue
---
configure.ac | 2 +-
libccd/configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a606561..2178c49 100644
--- a/configure.ac
diff -u b/configure.ac b/configure.ac
--- b/configure.ac
+++ b/configure.ac
@@ -452,7 +452,7 @@ then
@@ -452,8 +452,14 @@
fi
fi
-AC_CONFIG_SUBDIRS([libccd])
+#AC_CONFIG_SUBDIRS([libccd])
-
+if test x$use_libccd = xyes
+then
+ if test x$libccd_source = xinternal
+ then
+ AC_CONFIG_SUBDIRS([libccd])
+ fi
+fi
+
AM_CONDITIONAL(LIBCCD, test x$use_libccd != xno)
AM_CONDITIONAL(LIBCCD_INTERNAL, test x$libccd_source = xinternal)
diff --git a/libccd/configure.ac b/libccd/configure.ac
index 7e86a8c..5a12836 100644
AM_CONDITIONAL(LIBCCD_BOX_CYL, test x$col_box_cylinder = xlibccd)
unchanged:
--- a/libccd/configure.ac
+++ b/libccd/configure.ac
@@ -5,7 +5,7 @@
......
0001-Patch-to-solve-autoreconf-issue.patch
0001-Patch-to-solve-autoreconf-libccd-issue.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment