applied patch from Hanno Boeck that adds more configure options (bug

2007-04-11  Sven Neumann  <sven@gimp.org>

	* configure.in: applied patch from Hanno Boeck that adds more
	configure options (bug #425267).


svn path=/trunk/; revision=22234
This commit is contained in:
Sven Neumann 2007-04-11 11:36:29 +00:00 committed by Sven Neumann
parent 7fd724e2da
commit 82bcef803e
2 changed files with 31 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2007-04-11 Sven Neumann <sven@gimp.org>
* configure.in: applied patch from Hanno Boeck that adds more
configure options (bug #425267).
2007-04-11 Sven Neumann <sven@gimp.org>
* plug-ins/ifscompose/ifscompose_utils.c (ifs_render): applied

View File

@ -1272,6 +1272,14 @@ fi
uri_plugin=no
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
AC_ARG_WITH(gnomevfs, [ --without-gnomevfs build without gnomevfs support])
have_gnomeui="no (disabled)"
have_gnome_keyring="no (disabled)"
have_gnomevfs="no (disabled)"
if test x$with_gnomevfs != xno; then
if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
have_gnomeui=yes
gnome_vfs_modules="$gnome_vfs_modules libgnomeui-2.0"
@ -1291,15 +1299,25 @@ PKG_CHECK_MODULES(URI_GNOME_VFS, $gnome_vfs_modules,
AC_MSG_RESULT([no])
have_gnomevfs="no (gnome-vfs-2.0 not found)")
fi
AM_CONDITIONAL(HAVE_GNOMEVFS, test x"$have_gnomevfs" = xyes)
libcurl_modules="libcurl >= libcurl_required_version"
AC_ARG_WITH(libcurl, [ --without-libcurl build without curl support])
have_libcurl="no (disabled)"
if test x$with_libcurl != xno; then
PKG_CHECK_MODULES(URI_LIBCURL, $libcurl_modules,
have_libcurl=yes,
AC_MSG_RESULT([no])
have_libcurl="no (libcurl not found)")
fi
AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes)
if test "x$have_gnomevfs" = xyes; then
@ -1447,11 +1465,19 @@ AM_CONDITIONAL(HAVE_DX_DINPUT, test $have_dx_dinput = yes)
# Check for D-Bus GLib bindings
###############################
AC_ARG_WITH(dbus, [ --without-dbus build without D-Bus support])
have_dbus_glib="no (disabled)"
if test x$with_dbus != xno; then
PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_required_version,
have_dbus_glib=yes,
AC_MSG_RESULT([no])
have_dbus_glib=no)
fi
if test "x$have_dbus_glib" = xyes; then
AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
if test x$DBUS_BINDING_TOOL = xno; then