[dia] Use AC_HELP_STRING and show more configure status
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Use AC_HELP_STRING and show more configure status
- Date: Sat, 19 Oct 2013 15:38:31 +0000 (UTC)
commit cc73a9e7e476b2fbddbdeebf3886dabf97879f11
Author: Hans Breuer <hans breuer org>
Date: Sat Oct 19 17:37:52 2013 +0200
Use AC_HELP_STRING and show more configure status
configure.in | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/configure.in b/configure.in
index 8a533b3..d5c9c61 100644
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,7 @@ PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.20.0, ,
AC_MSG_ERROR([Need Pango version 1.20.0 or higher]))
AC_ARG_WITH(freetype,
-[ --without-freetype compile without FreeType support],,with_freetype=yes)
+ AC_HELP_STRING([--without-freetype],[compile without FreeType support]),,with_freetype=yes)
if test "x$with_freetype" = "xyes"; then
PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
if test "$have_pangoft2" = "true"; then
@@ -157,7 +157,7 @@ AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
dnl Look for Cairo
AC_ARG_WITH(cairo,
-[ --with-cairo compile cairo plug-in],,with_cairo=yes)
+ AC_HELP_STRING([--with-cairo],[compile cairo plug-in]),,with_cairo=yes)
if test "x$with_cairo" != "xno"; then
PKG_CHECK_MODULES(CAIROVERSION, cairo >= 1.6.0, ,
AC_MSG_ERROR([Need Cairo version 1.6.0 or higher]))
@@ -192,8 +192,8 @@ AC_SUBST(XSLT_CFLAGS)
# Figure out a prefix for where to find libxslt at runtime.
AC_ARG_WITH(xslt-prefix,
- [ --with-xslt-prefix=DIR Specify where to find the optional XSLT libraries
- (default=/usr/lib)],
+ AC_HELP_STRING([--with-xslt-prefix=DIR],[Specify where to find the optional XSLT libraries
+ (default=/usr/lib)]),
libxslt_prefix=$withval,
libxslt_prefix=/usr/lib)
AC_DEFINE_UNQUOTED(LIBXSLT_PREFIX,"$libxslt_prefix", [Place to look for XSLT libs])
@@ -308,7 +308,7 @@ dnl
dnl Debugging
dnl
AC_ARG_ENABLE(debug,
-[ --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]],
+ AC_HELP_STRING([--enable-debug=[no/minimum/yes]],[turn on debugging [default=minimum]]),
,
enable_debug=minimum)
@@ -326,7 +326,8 @@ dnl
dnl Deprecation
dnl
AC_ARG_ENABLE(deprecation,
-[ --enable-deprecation=[no,glib,pango,gtk,yes] turn on glib/pango/gtk deprecations [default=no]],
+ AC_HELP_STRING([--enable-deprecation=[no,glib,pango,gtk,yes]],
+ [turn on glib/pango/gtk deprecations [default=no]]),
,
enable_deprecation=no)
if test "x$enable_deprecation" != "xno"; then
@@ -527,7 +528,7 @@ AM_CONDITIONAL(HAVE_GCC, test "$GCC" = yes)
dnl Do we have the db2html script to build the documentation?
AC_ARG_ENABLE(db2html,
-[ --enable-db2html don't rebuild documentation],,enable_db2html=no)
+ AC_HELP_STRING([--enable-db2html],[don't rebuild documentation]),,enable_db2html=no)
AC_PATH_PROG(DB2HTML, db2html, no)
AM_CONDITIONAL(HAVE_DB2HTML,
test "x$enable_db2html" != xno && test "x$DB2HTML" != xno)
@@ -549,7 +550,7 @@ AC_SUBST(DB2MAN, "http://docbook.sourceforge.net/release/xsl/current/manpages/do
dnl Handling for Python
AC_ARG_WITH(python,
-[ --with-python compile python plug-in],,with_python=no)
+ AC_HELP_STRING([--with-python],[compile python plug-in]),,with_python=no)
if test "x$with_python" != xno; then
AM_PATH_PYTHON(2.3.0)
@@ -565,7 +566,7 @@ AM_CONDITIONAL(WITH_PYTHON, test "x$with_python" != "xno")
dnl Handling of Python bindings with SWIG
AC_ARG_WITH(swig,
-[ --with-swig generate python bindings with swig],,with_swig=no)
+ AC_HELP_STRING([--with-swig],[generate python bindings with swig]),,with_swig=no)
if test "x$with_swig" != "xno"; then
AC_PROG_SWIG(1.3.31)
@@ -583,7 +584,7 @@ dnl
dnl html, pdf and postscript documentation
dnl
AC_ARG_WITH(hardbooks,
-[ --with-hardbooks compile html, pdf and postscript documentation],,with_hardbooks=no)
+ AC_HELP_STRING([--with-hardbooks],[compile html, pdf and postscript documentation]),,with_hardbooks=no)
AC_PATH_PROG(DBLATEX,dblatex,no)
dnl
@@ -751,7 +752,9 @@ Configuration:
Libart support (PNG export): ${have_libart}
Cairo support (PNG, PDF, print): ${with_cairo}
Dia Python bindings with SWIG ${with_swig}
+ PDF import with poppler (experimental) ${have_poppler}
WMF plug-in with libEMF: ${emf_ok}
+ Layout plug-in with OGDF: ${ogdf_ok}
html doc: ${xsltproc_ok}
pdf and ps doc: ${hardbook_ok}
Enable deprecations (disable deprecated) ${enable_deprecation}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]