dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in redid the libgnomeui and gnome-vfs checks so that pkg-config 

2005-08-16  Sven Neumann  <sven@gimp.org>

	* configure.in
	* plug-ins/uri/Makefile.am: redid the libgnomeui and gnome-vfs
	checks so that pkg-config combines the compiler and linker flags
	instead of concatenating them in the Makefile.
This commit is contained in:
Sven Neumann 2005-08-16 10:40:53 +00:00 committed by Sven Neumann
parent 67a2c7b4d1
commit f2a786ec99
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,4 +1,12 @@
2005-08-16 Sven Neumann <sven@gimp.org>
* configure.in
* plug-ins/uri/Makefile.am: redid the libgnomeui and gnome-vfs
checks so that pkg-config combines the compiler and linker flags
instead of concatenating them in the Makefile.
2005-08-15 Akkana Peck <akkana@cvs.gnome.org>
* app/actions/image-actions.c
* app/tools/gimpaligntool.c
* menus/image-menu.xml.in

28
configure.in
View File

@ -1185,27 +1185,25 @@ AC_SUBST(POPPLER)
AC_SUBST(LIBPOPPLER)
#####################
# Check for gnome-vfs
#####################
#################################################
# Check for gnome-vfs (and optionally libgnomeui)
#################################################
PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= gnome_vfs_required_version,
uri_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
have_gnomeui=yes
uri_modules="$uri_modules libgnomeui-2.0"
else
AC_MSG_WARN([*** URI plug-in will be built without libgnomeui support (libgnomeui-2.0 not found) ***])
fi
PKG_CHECK_MODULES(URI, $uri_modules,
have_gnomevfs=yes,
AC_MSG_WARN([*** URI plug-in will be built without gnome-vfs support (gnome-vfs-2.0 not found) ***]))
AM_CONDITIONAL(HAVE_GNOMEVFS, test x$have_gnomevfs = xyes)
######################
# Check for libgnomeui
######################
PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= gnomeui_required_version,
have_gnomeui=yes,
AC_MSG_WARN([*** URI plug-in will be built without libgnomeui support (libgnomeui-2.0 not found) ***]))
AM_CONDITIONAL(HAVE_GNOMEUI, test x$have_gnomeui = xyes)
if test "x$have_gnomeui" = xyes; then
AC_DEFINE(HAVE_GNOMEUI, 1, "Define to 1 if libgnomeui is available")
fi

11
plug-ins/uri/Makefile.am
View File

@ -20,13 +20,6 @@ libexec_PROGRAMS = uri
if HAVE_GNOMEVFS
backend_sources = uri-backend-gnomevfs.c
if HAVE_GNOMEUI
backend_cflags = $(GNOMEVFS_CFLAGS) $(GNOMEUI_CFLAGS)
backend_libs = $(GNOMEVFS_LIBS) $(GNOMEUI_LIBS)
else
backend_cflags = $(GNOMEVFS_CFLAGS)
backend_libs = $(GNOMEVFS_LIBS)
endif
else
backend_sources = uri-backend-wget.c
endif
@ -38,8 +31,8 @@ uri_SOURCES = \
INCLUDES = \
-I$(top_srcdir) \
$(URI_CFLAGS) \
$(GTK_CFLAGS) \
$(backend_cflags) \
-I$(includedir)
LDADD = \
@ -50,7 +43,7 @@ LDADD = \
$(libgimp) \
$(libgimpcolor) \
$(libgimpbase) \
$(URI_LIBS) \
$(GTK_LIBS) \
$(backend_libs) \
$(RT_LIBS) \
$(INTLLIBS)