Commit 395f03fc authored by Roland Levillain's avatar Roland Levillain
Browse files

Make the building of the bundled Trimesh library optional.

	* build-aux/trimesh.m4: New.
	* configure.ac: Invoke OLN_WITH_TRIMESH.
	(WITH_TRIMESH): New conditional.
	* external/Makefile.am (SUBDIRS) [!WITH_TRIMESH]: Empty.
	(SUBDIRS) [WITH_TRIMESH]: Add trimesh.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3259 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent a7e2e96d
2009-02-03 Roland Levillain <roland@lrde.epita.fr>
Make the building of the bundled Trimesh library optional.
* build-aux/trimesh.m4: New.
* configure.ac: Invoke OLN_WITH_TRIMESH.
(WITH_TRIMESH): New conditional.
* external/Makefile.am (SUBDIRS) [!WITH_TRIMESH]: Empty.
(SUBDIRS) [WITH_TRIMESH]: Add trimesh.
2009-02-03 Guillaume Lazzara <z@lrde.epita.fr>
* configure.ac: Configure milena/tests/convert/impl.
......
# -*- 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
])
......@@ -108,7 +108,11 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
# (Bundled) trimesh2 library.
AC_CONFIG_SUBDIRS([external/trimesh])
OLN_WITH_TRIMESH
if test x$with_trimesh = xyes; then
AC_CONFIG_SUBDIRS([external/trimesh])
fi
AM_CONDITIONAL([WITH_TRIMESH], [test x$with_trimesh = xyes])
# FreeImage library.
OLN_WITH_FREEIMAGEPLUS
......@@ -260,6 +264,7 @@ AC_CONFIG_FILES([
## Applications. ##
## -------------- ##
# FIXME: Don't build applications depending on Trimesh if Trimesh is not built.
# Ask for the creation of applications' Makefiles.
# FIXME: Should it be achieved through oln.m4 macros, as we did in Olena 0.11?
# FIXME: ENABLE IT
......
## Process this file through Automake to produce Makefile.in -*- Makefile -*-
SUBDIRS = trimesh
SUBDIRS =
if WITH_TRIMESH
SUBDIRS += trimesh
endif WITH_TRIMESH
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