mirror of https://github.com/GNOME/gimp.git
simplified exif check by using PKG_CHECK_MODULES().
2003-06-23 Sven Neumann <sven@gimp.org> * configure.in: simplified exif check by using PKG_CHECK_MODULES(). * plug-ins/common/mkgen.pl: allow for multiple library dependencies. * plug-ins/common/plugin-defs.pl: added exif dependency to the jpeg plug-in. * plug-ins/common/Makefile.am: regenerated.
This commit is contained in:
Sven Neumann
Sven Neumann
parent
1abfa8da27
commit
742d55466f
21
ChangeLog
21
ChangeLog
|
|
@ -1,8 +1,19 @@
|
|||
2003-06-23 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* configure.in: simplified exif check by using PKG_CHECK_MODULES().
|
||||
|
||||
* plug-ins/common/mkgen.pl: allow for multiple library dependencies.
|
||||
|
||||
* plug-ins/common/plugin-defs.pl: added exif dependency to the
|
||||
jpeg plug-in.
|
||||
|
||||
* plug-ins/common/Makefile.am: regenerated.
|
||||
|
||||
2003-06-22 Dave Neary <bolsh@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* plug-ins/common/Makefile.am
|
||||
* plug-ins/common/jpeg.c: Add support for the keeping of EXIF
|
||||
* plug-ins/common/jpeg.c: Added support for the keeping of EXIF
|
||||
information in jpeg files. This is step 1 in the overall plan to
|
||||
an all-singing, all-dancing metadata editor. Next step is to do
|
||||
the same thing for TIFFs, then to do both properly as a number of
|
||||
|
|
@ -16,8 +27,8 @@
|
|||
|
||||
2003-06-22 Dave Neary <bolsh@gimp.org>
|
||||
|
||||
* app/config/gimpbaseconfig.c: Increased default tile
|
||||
cache to 64 MB.
|
||||
* app/config/gimpbaseconfig.c: Increased default tile cache size
|
||||
to 64 MB.
|
||||
|
||||
2003-06-22 Sven Neumann <sven@gimp.org>
|
||||
|
||||
|
|
@ -49,8 +60,8 @@
|
|||
|
||||
2003-06-20 Dave Neary <bolsh@gimp.org>
|
||||
|
||||
* app/config/gimpdisplayconfig.c: Enable menus on
|
||||
image windows by default.
|
||||
* app/config/gimpdisplayconfig.c: Enable menus on image windows by
|
||||
default.
|
||||
|
||||
2003-06-20 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
|
|
|
|||
26
configure.in
26
configure.in
|
|
@ -915,31 +915,15 @@ AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno)
|
|||
# avoid destruction, but no data modification is performed.
|
||||
############################################################
|
||||
|
||||
exif_msg="no - EXIF support will not be built into the JPEG plug-in.
|
||||
libexif is available from http://www.sourceforge.net/projects/libexif"
|
||||
|
||||
AC_ARG_WITH(libexif, [ --without-libexif build without EXIF support])
|
||||
if test x$with_libexif != xno && test -z "$LIBEXIF"; then
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config)
|
||||
|
||||
if test -n "${PKG_CONFIG}"; then
|
||||
AC_MSG_CHECKING([for libexif])
|
||||
|
||||
if ${PKG_CONFIG} --exists libexif > /dev/null 2>&1; then
|
||||
EXIF_CFLAGS=`$PKG_CONFIG --cflags libexif`
|
||||
EXIF_LIBS=`$PKG_CONFIG --libs libexif`
|
||||
exif_msg="yes"
|
||||
AC_DEFINE(HAVE_EXIF, 1, \
|
||||
"Defined if EXIF support is to be added to the JPEG plug-in")
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT($exif_msg)
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(EXIF, libexif,
|
||||
AC_DEFINE(HAVE_EXIF, 1, "Define to 1 if libexif is available"),
|
||||
AC_MSG_WARN([libexif not found!
|
||||
EXIF support will not be built into the JPEG plug-in.
|
||||
libexif is available from http://www.sourceforge.net/projects/libexif]))
|
||||
fi
|
||||
|
||||
AC_SUBST(EXIF_CFLAGS)
|
||||
AC_SUBST(EXIF_LIBS)
|
||||
|
||||
###########################################################
|
||||
# Some plug-ins don't build on Win32, others are Win32-only
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ all other GIMP Library headers.
|
|||
</para>
|
||||
|
||||
|
||||
|
||||
<!-- ##### MACRO gimp_get_data_size ##### -->
|
||||
<para>
|
||||
|
||||
|
|
@ -70,6 +71,7 @@ all other GIMP Library headers.
|
|||
</para>
|
||||
|
||||
|
||||
|
||||
<!-- ##### USER_FUNCTION GimpInitProc ##### -->
|
||||
<para>
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -54,8 +54,9 @@ EXTRA_DIST = \\
|
|||
|
||||
INCLUDES = \\
|
||||
-I\$(top_srcdir) \\
|
||||
\$(GTK_CFLAGS) \\
|
||||
\$(X_CFLAGS) \\
|
||||
\@GTK_CFLAGS\@ \\
|
||||
\@X_CFLAGS\@ \\
|
||||
\@EXIF_CFLAGS\@ \\
|
||||
-I\$(includedir)
|
||||
|
||||
libexec_PROGRAMS = \\
|
||||
|
|
@ -101,6 +102,14 @@ foreach (sort keys %plugins) {
|
|||
$optlib = "\n\t\$(LIB\U$name\E)\t\t\t\t\t\t\t\\";
|
||||
}
|
||||
|
||||
my $deplib = "\@INTLLIBS\@";
|
||||
if (exists $plugins{$_}->{libdep}) {
|
||||
my @lib = split(/:/, $plugins{$_}->{libdep});
|
||||
foreach $lib (@lib) {
|
||||
$deplib = "\@\U$lib\E_LIBS\@\t\t\t\t\t\t\t\\\n\t$deplib";
|
||||
}
|
||||
}
|
||||
|
||||
if (exists $plugins{$_}->{libsupp}) {
|
||||
my @lib = split(/:/, $plugins{$_}->{libsupp});
|
||||
foreach $lib (@lib) {
|
||||
|
|
@ -115,8 +124,7 @@ ${_}_SOURCES = \\
|
|||
|
||||
${_}_LDADD = \\
|
||||
$libgimp \\$optlib
|
||||
\$(\U$plugins{$_}->{libdep}\E_LIBS) \\
|
||||
\$(INTLLIBS)
|
||||
$deplib
|
||||
EOT
|
||||
|
||||
print IGNORE "$_\n";
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
'illusion' => { libdep => 'gtk', ui => 1 },
|
||||
'iwarp' => { libdep => 'gtk', ui => 1 },
|
||||
'jigsaw' => { libdep => 'gtk', ui => 1 },
|
||||
'jpeg' => { libdep => 'gtk', ui => 1, optional => 1 },
|
||||
'jpeg' => { libdep => 'exif:gtk', ui => 1, optional => 1 },
|
||||
'laplace' => { libdep => 'glib', ui => 1 },
|
||||
'lic' => { libdep => 'gtk', ui => 1 },
|
||||
'mail' => { libdep => 'gtk', ui => 1, optional => 1 },
|
||||
|
|
|
|||
Loading…
Reference in New Issue