* m4/trimesh.m4: Remove, and move relevant lines... * configure.ac: ...here. Adjust. * external/Makefile.am: Adjust. --- ChangeLog | 9 +++++++++ configure.ac | 19 ++++++++++++++----- external/Makefile.am | 4 ++-- m4/trimesh.m4 | 18 ------------------ 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 m4/trimesh.m4 diff --git a/ChangeLog b/ChangeLog index bbbd398..3f7ea4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +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. diff --git a/configure.ac b/configure.ac index d08aec7..6b46bc8 100644 --- a/configure.ac +++ b/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. ## ## --------- ## diff --git a/external/Makefile.am b/external/Makefile.am index e288aa7..73896d3 100644 --- a/external/Makefile.am +++ b/external/Makefile.am @@ -2,6 +2,6 @@ SUBDIRS = -if WITH_TRIMESH +if ENABLE_TRIMESH SUBDIRS += trimesh -endif WITH_TRIMESH +endif ENABLE_TRIMESH diff --git a/m4/trimesh.m4 b/m4/trimesh.m4 deleted file mode 100644 index 11d8ca6..0000000 --- a/m4/trimesh.m4 +++ /dev/null @@ -1,18 +0,0 @@ -# -*- 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 -]) -- 1.6.1.2