Improve configure.ac w.r.t. Trimesh.

	* m4/trimesh.m4: Remove, and move relevant lines...
	* configure.ac: ...here.
	Adjust.
	* external/Makefile.am: Adjust.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3807 4aad255d-cdde-0310-9447-f3009e2ae8c0

ChangeLog

+2009-05-11  Roland Levillain  <roland@lrde.epita.fr>
+
+	Improve configure.ac w.r.t. Trimesh.
+
+	* m4/trimesh.m4: Remove, and move relevant lines...
+	* configure.ac: ...here.
+	Adjust.
+	* external/Makefile.am: Adjust.
+
 2009-04-16  Roland Levillain  <roland@lrde.epita.fr>
 
 	Have Makefile.am be more portable.

configure.ac

@@ -111,20 +111,29 @@ AC_CANONICAL_HOST
 AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
 
 
-# (Bundled) trimesh2 library.
-OLN_WITH_TRIMESH
-AC_CONFIG_SUBDIRS([external/trimesh])
-AM_CONDITIONAL([WITH_TRIMESH], [test x$with_trimesh = xyes])
+## -------------------- ##
+## External libraries.  ##
+## -------------------- ##
 
 # FreeImage library.
 OLN_WITH_FREEIMAGEPLUS
 AM_CONDITIONAL([FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes])
 
-# Cfitsio library.
+# CFITSIO library.
 OLN_WITH_CFITSIO
 AM_CONDITIONAL([CFITSIO], [test x$oln_have_cfitsio = xyes])
 
 
+## ---------------------------- ##
+## (Bundled) trimesh2 library.  ##
+## ---------------------------- ##
+
+AC_ARG_ENABLE([trimesh],
+              [AS_HELP_STRING([--with-trimesh],
+                              [build the (bundled) trimesh2 library])])
+AM_CONDITIONAL([ENABLE_TRIMESH], [test x$enable_trimesh = xyes])
+AC_CONFIG_SUBDIRS([external/trimesh])
+
 ## --------- ##
 ## Swilena.  ##
 ## --------- ##

external/Makefile.am

@@ -2,6 +2,6 @@
 
 SUBDIRS =
 
-if WITH_TRIMESH
+if ENABLE_TRIMESH
   SUBDIRS += trimesh
-endif WITH_TRIMESH
+endif ENABLE_TRIMESH

m4/trimesh.m4

-#                                                       -*- Autoconf -*-
-
-# OLN_WITH_TRIMESH(WITH, WITHOUT)
-# -------------------------------
-# Should we build Trimesh or not.
-AC_DEFUN([OLN_WITH_TRIMESH],
-[AC_ARG_WITH([trimesh],
-             [AS_HELP_STRING([--with-trimesh],
-                             [build the Trimesh library])],
-                             [],
-                             [with_trimesh=no])
-
-case $with_trimesh in
-  yes) $1;;
-  no ) $2;;
-  *)   AC_MSG_ERROR([incorrect with_trimesh value: $with_trimesh]);;
-esac
-])