aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-22 20:14:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-22 20:14:55 +0000
commit45e029b6cd382b3dbeffc1bd4dfab07d204fb4e0 (patch)
treeddfb76a3180cc912c4d30338977888ff0e1c7372
parent60f7acfdba312268fe7d877e554e19323802eac2 (diff)
downloadpaludis-45e029b6cd382b3dbeffc1bd4dfab07d204fb4e0.tar.gz
paludis-45e029b6cd382b3dbeffc1bd4dfab07d204fb4e0.tar.xz
More monolithic work
-rw-r--r--configure.ac22
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 9ac3061..4ae92e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,30 +21,32 @@ AC_SUBST([VERSION_LIB_CURRENT])
AC_SUBST([VERSION_LIB_REVISION])
AM_INIT_AUTOMAKE(paludis, [$VERSION_FULL])
+AC_LANG([C++])
dnl }}}
dnl {{{ monolithic build
AC_MSG_CHECKING([whether to do a monolithic build])
AC_ARG_ENABLE([monolithic],
AS_HELP_STRING([--enable-monolithic], [Make a monolithic build (developer use only)]),
- [MONOLITHIC=$enableval
+ [build_monolithic=$enableval
AC_MSG_RESULT([$enableval])],
- [MONOLITHIC=no
+ [build_monolithic=no
AC_MSG_RESULT([no])])
+MONOLITHIC=$build_monolithic
AC_SUBST([MONOLITHIC])
-AM_CONDITIONAL([MONOLITHIC], test "x$MONOLITHIC" = "xyes")
-if test "x$MONOLITHIC" = "xyes" ; then
+AM_CONDITIONAL([MONOLITHIC], test "x$build_monolithic" = "xyes")
+if test "x$build_monolithic" = "xyes" ; then
AC_DEFINE([MONOLITHIC], [1], [Make a monolithic build])
+else
+ AC_DISABLE_STATIC
fi
+AC_MSG_CHECKING([whether we're building shared libaries])
+AC_MSG_RESULT([$enable_shared])
+AC_MSG_CHECKING([whether we're building static libaries])
+AC_MSG_RESULT([$enable_static])
dnl }}}
dnl {{{ basic toolchain checks
-AC_LANG([C++])
-if test "x$MONOLITHIC" = "xyes" ; then
- AC_DISABLE_SHARED
-else
- AC_DISABLE_STATIC
-fi
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LN_S