https://svn.lrde.epita.fr/svn/oln/trunk
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Handle Darwin, in order to use trimesh's gluit.mk.
* configure.ac: Add a new conditional for Darwin-based hosts.
configure.ac | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
Index: configure.ac
--- configure.ac (revision 2110)
+++ configure.ac (working copy)
@@ -82,9 +82,17 @@
fi
-## ----------- ##
-## Libraries. ##
-## ----------- ##
+## ------------------ ##
+## Libraries set up. ##
+## ------------------ ##
+
+# Use Libtool.
+AC_PROG_LIBTOOL
+
+# Check for Darwin.
+AC_CANONICAL_HOST
+AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
+
# (Bundled) trimesh2 library.
AC_CONFIG_SUBDIRS([external/trimesh])
@@ -102,11 +110,11 @@
## Swilena. ##
## --------- ##
-AC_PROG_LIBTOOL
-
OLN_WITH_SWILENA([with_swilena=yes], [with_swilena=no])
AM_CONDITIONAL([ENABLE_SWILENA], [test x$with_swilena = xyes])
+# FIXME: Should we still configure these files if ENABLE_SWILENA is
+# false?
AC_CONFIG_FILES([swilena/Makefile
swilena/python/Makefile])