From 2ad4425be93c5ce2e24d73c14ee869feafc5fee5 Mon Sep 17 00:00:00 2001 From: Phil Longstaff Date: Mon, 6 Apr 2009 12:15:18 +0000 Subject: [PATCH] 1) Use AS_HELP_STRING() to line up stuff in '--help' output 2) Remove last traces of old GDA stuff git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18020 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.in | 84 +++++++++++++++++++--------------------------------- 1 file changed, 30 insertions(+), 54 deletions(-) diff --git a/configure.in b/configure.in index 1628a68158..06162356bc 100644 --- a/configure.in +++ b/configure.in @@ -555,7 +555,7 @@ dnl This makes sure that we default to using internal QOF for SVN. dnl Make sure to enable this to be the default for stable releases! AC_ARG_ENABLE(qof, - [ --enable-qof enable the search for an external QOF library (disabled)], + [AS_HELP_STRING([--enable-qof],[enable the search for an external QOF library (disabled)])], [AC_MSG_ERROR([GnuCash has disabled use of external QOF.]) case "${enableval}" in yes) gnc_enable_qof=true ;; @@ -564,10 +564,10 @@ AC_ARG_ENABLE(qof, esac], [gnc_enable_qof=false]) -AC_ARG_WITH(qof, [ --with-qof=path prefix for Query Object Framework - QOF (auto)], +AC_ARG_WITH(qof, [AS_HELP_STRING([--with-qof=path],[prefix for Query Object Framework - QOF (auto)])], [gnc_with_qof=$withval], [gnc_with_qof=yes]) AC_ARG_WITH(qt3_wizard_package, - [ --with-qt3-wizard-package=name name of package containing qt3-wizard (aqbanking)], + [AS_HELP_STRING([--with-qt3-wizard-package=name],[name of package containing qt3-wizard (aqbanking)])], [QT3_WIZARD_PACKAGE=$withval], [QT3_WIZARD_PACKAGE=aqbanking]) AC_DEFINE_UNQUOTED([QT3_WIZARD_PACKAGE],["$QT3_WIZARD_PACKAGE"],[Name of package containing qt3-wizard.]) @@ -628,24 +628,6 @@ AC_SUBST(QOF_XML_DIR) AC_DEFINE(QOF_DISABLE_DEPRECATED,1, [Don't use deprecated qof functions]) -### ----------------------- -### LIBGDA -#AC_ARG_ENABLE(gda, -# [AS_HELP_STRING([--enable-gda],[build with the libgda backend])], -# [case "${enableval}" in -# yes) want_gda=true ;; -# no) want_gda=false ;; -# *) want_gda=false ;; -# esac], -# [want_gda=false]) -#if test x${want_gda} = xtrue -#then -# PKG_CHECK_MODULES(LIBGDA, libgda-4.0 >= 3.99.2, [GDA_DIR=gda]) -#fi -#AC_SUBST(GDA_DIR) -#AC_SUBST(LIBGDA_CFLAGS) -#AC_SUBST(LIBGDA_LIBS) - ### ---------------------- ### LIBDBI AC_ARG_ENABLE(dbi, @@ -704,7 +686,7 @@ AC_SUBST(GNC_SHAREDIR) AC_SUBST(GNC_LIBEXECDIR) AC_ARG_ENABLE( debug, - [ --enable-debug compile with debugging flags set], + [AS_HELP_STRING([--enable-debug],[compile with debugging flags set])], [ # remove any optimization flags... CFLAGS=`echo ${CFLAGS} | sed -e 's,-O.,,g'` @@ -715,24 +697,21 @@ AC_ARG_ENABLE( debug, AC_DEFINE(DEBUG_MEMORY,0,[Enable debug memory])]) AC_ARG_ENABLE( profile, - [ --enable-profile compile with profiling set], + [AS_HELP_STRING([--enable-profile],[compile with profiling set])], CFLAGS="${CFLAGS} -pg" LDFLAGS="${LDFLAGS} -pg") AC_ARG_ENABLE( ref-counts-dumps, - [ --enable-ref-counts-dumps compile with ref count dumps], + [AS_HELP_STRING([--enable-ref-counts-dumps],[compile with ref count dumps])], AC_DEFINE(DEBUG_REFERENCE_COUNTING,1,[Enable reference count dumps]) AC_DEFINE(DEBUG_REFERENCE_COUNTING,0,[Enable reference count dumps]) ) -### -------------------------------------------------------------------------- -### RPC has been removed in gnucash 1.9.0 - ### -------------------------------------------------------------------------- ### OFX want_ofx=auto AC_ARG_ENABLE( ofx, - [ --enable-ofx compile with ofx support (needs LibOFX)], + [AS_HELP_STRING([--enable-ofx],[compile with ofx support (needs LibOFX)])], [ case "$enableval" in yes) want_ofx=yes ;; no) want_ofx=no ;; @@ -747,7 +726,7 @@ esac if test x${want_ofx} != xno ; then AC_ARG_WITH( ofx-prefix, - [ --with-ofx-prefix=DIR specify where to look for libOFX], + [AS_HELP_STRING([--with-ofx-prefix=DIR],[specify where to look for libOFX])], OFXPREFIX="$with_ofx_prefix" ) if test x${OFXPREFIX} != x ; then @@ -815,7 +794,7 @@ AC_SUBST(OFX_DIR) ### -------------------------------------------------------------------------- ### MT940 AC_ARG_ENABLE( mt940, - [ --enable-mt940 obsolete, included in --enable-aqbanking], + [AS_HELP_STRING([--enable-mt940],[obsolete, included in --enable-aqbanking])], if test "x$enableval" != "xno" ; then AC_MSG_ERROR([--enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking]) fi) @@ -824,12 +803,12 @@ AC_ARG_ENABLE( mt940, ### AqBanking AC_ARG_ENABLE( aqbanking, - [ --enable-aqbanking compile with AqBanking support], + [AS_HELP_STRING([--enable-aqbanking],[compile with AqBanking support])], if test "x$enableval" != "xno" ; then want_aqbanking=yes fi) AC_ARG_ENABLE( hbci, - [ --enable-hbci an alias for --enable-aqbanking], + [AS_HELP_STRING([--enable-hbci],[an alias for --enable-aqbanking])], if test "x$enableval" != "xno" ; then want_aqbanking=yes fi) @@ -872,7 +851,7 @@ LANGINFO_D_FMT_CHECK dnl Enable locale-specific tax-related information in the accounts AC_ARG_ENABLE( locale-specific-tax, - [ --enable-locale-specific-tax enable localized tax categories (experimental)], + [AS_HELP_STRING([--enable-locale-specific-tax],[enable localized tax categories (experimental)])], AC_DEFINE(LOCALE_SPECIFIC_TAX,1,Enable the experimental locale-specific tax categories) ) dnl Make sure we have a proper gettext installed @@ -889,7 +868,7 @@ fi # Used to initialize doc-path. AC_ARG_WITH( help-prefix, - [ --with-help-prefix=PATH specify where to store the help files], + [AS_HELP_STRING([--with-help-prefix=PATH],[specify where to store the help files])], GNC_HELPDIR="$with_help_prefix", GNC_HELPDIR="\${datadir}") @@ -900,7 +879,7 @@ AC_SUBST(GNC_HELPDIR) ### Check for etags AC_ARG_ENABLE( etags, - [ --enable-etags enable automatic create of TAGS file], + [AS_HELP_STRING([--enable-etags],[enable automatic create of TAGS file])], if test x$enableval = xyes; then USE_ETAGS=1 fi, @@ -916,7 +895,7 @@ AM_CONDITIONAL(GNC_ETAGS_FILE, test x${GNC_ETAGS_FILE} = xTAGS) ### Check for ctags AC_ARG_ENABLE( ctags, - [ --enable-ctags enable automatic create of tags file], + [AS_HELP_STRING([--enable-ctags],[enable automatic create of tags file])], if test x$enableval = xyes; then USE_CTAGS=1 fi, @@ -933,7 +912,7 @@ AM_CONDITIONAL(GNC_CTAGS_FILE, test x${GNC_CTAGS_FILE} = xtags) # Check for perl, force version 5 AC_ARG_WITH(perl, - [ --with-perl=FILE which perl executable to use ], + [AS_HELP_STRING([--with-perl=FILE],[which perl executable to use])], PERL="${with_perl}") # If the user didn't specify a perl, then go fetch. @@ -963,7 +942,7 @@ AC_SUBST(PERL) # PERLINCL=`$PERL -MConfig -e 'print $Config{"archlibexp"}'` AC_ARG_WITH( perl-includes, - [ --with-perl-includes=DIR specify where to look for perl includes], + [AS_HELP_STRING([--with-perl-includes=DIR],[specify where to look for perl includes])], PERLINCL="$with_perl_includes" ) AC_SUBST(PERLINCL) @@ -971,10 +950,10 @@ AC_SUBST(PERLINCL) # ---------------------------------------------------------------------------- AC_DEFUN([BB_ENABLE_DOXYGEN], [ -AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) -AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) -AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes]) -AC_ARG_ENABLE(latex-docs, [ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no]) +AC_ARG_ENABLE(doxygen, [AS_HELP_STRING([--enable-doxygen],[enable documentation generation with doxygen (auto)])]) +AC_ARG_ENABLE(dot, [AS_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (auto)])]) +AC_ARG_ENABLE(html-docs, [AS_HELP_STRING([--enable-html-docs],[enable HTML generation with doxygen (yes)])], [], [ enable_html_docs=yes]) +AC_ARG_ENABLE(latex-docs, [AS_HELP_STRING([--enable-latex-docs],[enable LaTeX documentation generation with doxygen (no)])], [], [ enable_latex_docs=no]) if test "x$enable_doxygen" = xno; then enable_doc=no else @@ -1032,7 +1011,7 @@ AC_CHECK_LIB(popt, poptStrippedArgv,, [AC_MSG_ERROR([ ### -------------------------------------------------------------------------- AC_ARG_ENABLE(gui, - [ --disable-gui build without the GNOME GUI components of Gnucash], + [AS_HELP_STRING([--disable-gui],[build without the GNOME GUI components of Gnucash])], [case "${enableval}" in yes) gnc_build_gui=true ;; no) gnc_build_gui=false ;; @@ -1209,7 +1188,7 @@ esac ### ---------------------------------------------------------------------- AC_ARG_ENABLE( efence, - [ --enable-efence link using efence], + [AS_HELP_STRING([--enable-efence],[link using efence])], if test x$enableval = xyes; then EFENCE_LIBS="-lefence" USE_EFENCE=1 @@ -1251,7 +1230,7 @@ else allow_deprecated=false fi AC_ARG_ENABLE(deprecated-glib, - [ --disable-deprecated-glib don't use deprecated glib functions], + [AS_HELP_STRING([--disable-deprecated-glib],[don't use deprecated glib functions])], [case "${enableval}" in no) allow_deprecated=false ;; *) allow_deprecated=true ;; @@ -1270,7 +1249,7 @@ else allow_deprecated=false fi AC_ARG_ENABLE(deprecated-gdk, - [ --disable-deprecated-gdk don't use deprecated gdk functions], + [AS_HELP_STRING([--disable-deprecated-gdk],[don't use deprecated gdk functions])], [case "${enableval}" in no) allow_deprecated=false ;; *) allow_deprecated=true ;; @@ -1290,7 +1269,7 @@ else allow_deprecated=false fi AC_ARG_ENABLE(deprecated-gtk, - [ --disable-deprecated-gtk don't use deprecated gtk functions], + [AS_HELP_STRING([--disable-deprecated-gtk],[don't use deprecated gtk functions])], [case "${enableval}" in no) allow_deprecated=false ;; *) allow_deprecated=true ;; @@ -1309,7 +1288,7 @@ else allow_deprecated=false fi AC_ARG_ENABLE(deprecated-gnome, - [ --disable-deprecated-gnome don't use deprecated gnome functions], + [AS_HELP_STRING([--disable-deprecated-gnome],[don't use deprecated gnome functions])], [case "${enableval}" in no) allow_deprecated=false ;; *) allow_deprecated=true ;; @@ -1341,7 +1320,7 @@ AC_SUBST(LC_MESSAGES_ENUM) enable_python=false AC_ARG_ENABLE(python-bindings, - [ --enable-python-bindings enable python bindings], + [AS_HELP_STRING([--enable-python-bindings],[enable python bindings])], [case "${enableval}" in yes) enable_python=true ;; no) enable_python=false ;; @@ -1386,7 +1365,7 @@ then # Enable error-on-warning by default -- I'm tired of fixing other # people's missing #includes, etc. AC_ARG_ENABLE(error-on-warning, - [ --disable-error-on-warning disable treating compile warnings as errors], + [AS_HELP_STRING([--disable-error-on-warning],[disable treating compile warnings as errors])], [case "${enableval}" in yes) warnFLAGS="${warnFLAGS} -Werror" ; gnc_error_on_warning=yes ;; no) gnc_error_on_warning=no ;; @@ -1619,9 +1598,6 @@ output_qof_xml_dir=`eval eval eval echo $QOF_XML_DIR` if test x${DBI_DIR} != x; then components="$components dbi" fi -if test x${GDA_DIR} != x; then -components="$components gda" -fi if test x${OFX_DIR} != x; then components="$components ofx" fi @@ -1637,7 +1613,7 @@ AC_MSG_RESULT([ ------------------------- gnucash version ...... : $VERSION Build for host ....... : $host - Optional components....:$components + Optional components....: $components Extra Warnings ....... : $warnFLAGS CPPFLAGS ............. : $CPPFLAGS CFLAGS ............... : $CFLAGS