diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 5393100..e6051ca 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,28 @@ PKG_CHECK_MODULES([LIBXML],[ libxml-2.0 ]) +# ===== +# Tools +# ===== +AC_ARG_ENABLE([tools], + [AS_HELP_STRING([--disable-tools], [Build conversion tools])], + [enable_tools="$enableval"], + [enable_tools=yes] +) +AS_IF([test "x$enable_tools" = "xyes"], [ + PKG_CHECK_MODULES([REVENGE_GENERATORS],[ + librevenge-generators-0.0 + ]) + PKG_CHECK_MODULES([REVENGE_STREAM],[ + librevenge-stream-0.0 + ]) +]) +AC_SUBST([REVENGE_GENERATORS_CFLAGS]) +AC_SUBST([REVENGE_GENERATORS_LIBS]) +AC_SUBST([REVENGE_STREAM_CFLAGS]) +AC_SUBST([REVENGE_STREAM_LIBS]) +AM_CONDITIONAL(BUILD_TOOLS, [test "x$enable_tools" = "xyes"]) + # ================================= # Libtool/Version Makefile settings # ================================= @@ -202,21 +224,6 @@ AS_IF([test "x$enable_debug" = "xyes"], [ ]) AC_SUBST(DEBUG_CXXFLAGS) -# ============ -# Static tools -# ============ -AC_ARG_ENABLE([static-tools], - [AS_HELP_STRING([--enable-static-tools], [Link tools (binaries) statically])], - [enable_static_tools="$enableval"], - [enable_static_tools=no] -) -AS_IF([test "x$enable_static_tools" = "xyes"], [ - enable_static="yes" -], [ - AC_DISABLE_STATIC -]) -AM_CONDITIONAL(STATIC_TOOLS, [test "x$enable_static_tools" = "xyes"]) - # ============= # Documentation # ============= @@ -235,17 +242,6 @@ AS_IF([test "x$with_docs" != "xno"], [ ], [build_docs=no]) AM_CONDITIONAL([WITH_LIBPICT_DOCS], [test "x$build_docs" != "xno"]) -PKG_CHECK_MODULES([REVENGE_GENERATORS],[ - librevenge-generators-0.0 -]) -PKG_CHECK_MODULES([REVENGE_STREAM],[ - librevenge-stream-0.0 -]) -AC_SUBST([REVENGE_GENERATORS_CFLAGS]) -AC_SUBST([REVENGE_GENERATORS_LIBS]) -AC_SUBST([REVENGE_STREAM_CFLAGS]) -AC_SUBST([REVENGE_STREAM_LIBS]) - # ===================== # Prepare all .in files # ===================== @@ -266,8 +262,6 @@ build/win32/Makefile docs/Makefile docs/doxygen/Makefile libpict-$PICT_MAJOR_VERSION.$PICT_MINOR_VERSION.pc:libpict.pc.in -libpict.spec -libpict-zip ]) AC_OUTPUT @@ -279,7 +273,7 @@ AC_MSG_NOTICE([ Build configuration: debug: ${enable_debug} docs: ${build_docs} - static-tools: ${enable_static_tools} + tools: ${enable_tools} werror: ${enable_werror} ============================================================================== ]) |