* configure.in: remove un-needed/wanted gsf/goffice configure options

* macros/g-wrap.m4: fix the help text spacing.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13285 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2006-02-17 23:32:16 +00:00
parent d2221209ac
commit a55a6b3ae5
3 changed files with 27 additions and 24 deletions

View File

@ -39,6 +39,9 @@
* src/import-export/log-replay/gnc-log-replay.c: * src/import-export/log-replay/gnc-log-replay.c:
scrub the transaction for a currency after we replay. (#143720). scrub the transaction for a currency after we replay. (#143720).
* configure.in: remove un-needed/wanted gsf/goffice configure options
* macros/g-wrap.m4: fix the help text spacing.
2006-02-15 Derek Atkins <derek@ihtfp.com> 2006-02-15 Derek Atkins <derek@ihtfp.com>
* configure.in: get --disable-gui to actually do what we want. * configure.in: get --disable-gui to actually do what we want.

View File

@ -1337,7 +1337,7 @@ then
BZ2_LIBS= BZ2_LIBS=
test_bz2=true test_bz2=true
AC_ARG_WITH(bz2, AC_ARG_WITH(bz2,
[--{with,without}-bz2 Build additional wrappers for BZ2], [ --without-bz2 Build additional libgsf wrappers for BZ2],
if test "x$withval" = xno; then if test "x$withval" = xno; then
test_bz2=false test_bz2=false
fi fi
@ -1380,14 +1380,14 @@ then
dnl gnome dnl gnome
dnl dnl
want_gnome=auto want_gnome=yes
AC_ARG_WITH(gnome, #dnl AC_ARG_WITH(gnome,
[--{with,without}-gnome Build additional wrappers for GNOME-VFS and BONOBO], #dnl [--{with,without}-gnome Build additional wrappers for GNOME-VFS and BONOBO],
[case $withval in #dnl [case $withval in
yes) want_gnome=yes;; #dnl yes) want_gnome=yes;;
no) want_gnome=no;; #dnl no) want_gnome=no;;
esac[]dnl #dnl esac[]dnl
]) #dnl])
have_gnome=no have_gnome=no
if test $want_gnome = no ; then if test $want_gnome = no ; then
AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome to enable)]) AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome to enable)])
@ -1504,16 +1504,16 @@ then
dnl Should we use gtk ? dnl Should we use gtk ?
dnl ******************* dnl *******************
goffice_with_gtk=true goffice_with_gtk=true
AC_ARG_WITH(gtk, [ --without-gtk Build without UI]) #dnl AC_ARG_WITH(gtk, [ --without-gtk Build without UI])
if test "x$with_gtk" = xno; then #dnl if test "x$with_gtk" = xno; then
ui_msg="None (Gtk disabled by request)" #dnl ui_msg="None (Gtk disabled by request)"
goffice_with_gtk=false #dnl goffice_with_gtk=false
else #dnl else
dnl We shouldn't silently default to --without-gtk. dnl We shouldn't silently default to --without-gtk.
dnl If the requirements are not met, fail. dnl If the requirements are not met, fail.
ui_msg="Gtk" ui_msg="Gtk"
PKG_CHECK_MODULES(GTK, [$goffice_gtk_reqs]) PKG_CHECK_MODULES(GOFFICE_GTK, [$goffice_gtk_reqs])
fi #dnl fi
goffice_with_gnome=$goffice_with_gtk goffice_with_gnome=$goffice_with_gtk
if test "x$goffice_with_gtk" = "xtrue" ; then if test "x$goffice_with_gtk" = "xtrue" ; then
@ -1525,13 +1525,13 @@ then
dnl ************************************ dnl ************************************
goffice_with_gnome=true goffice_with_gnome=true
AC_ARG_WITH(gnome, #dnl AC_ARG_WITH(gnome,
[ --{with,without}-gnome Use GNOME extensions], #dnl [ --{with,without}-gnome Use GNOME extensions],
[if test "x$withval" = xno; then #dnl [if test "x$withval" = xno; then
goffice_with_gnome=false #dnl goffice_with_gnome=false
ui_msg="Gtk+ (Gnome disabled by request)" #dnl ui_msg="Gtk+ (Gnome disabled by request)"
fi] #dnl fi]
) #dnl)
if test "x$goffice_with_gnome" = "xtrue"; then if test "x$goffice_with_gnome" = "xtrue"; then
PKG_CHECK_MODULES(GOFFICE_GNOME, [$goffice_gnome_reqs], PKG_CHECK_MODULES(GOFFICE_GNOME, [$goffice_gnome_reqs],
[ui_msg="Gnome"], [ui_msg="Gnome"],