graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 14:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

add check for zlib for building psp plugin

Browse source 
* configure.in: add check for zlib for building psp plugin

* plug-ins/common/mkgen.pl
* plug-ins/common/plugin-defs.pl
* plug-ins/common/Makefile.am: add psp plugin

* plug-ins/common/mail.c: removed double gimp_destroy_params, fixing
a segfault

-Yosh
This commit is contained in:
Manish Singh 1999-08-22 22:51:31 +00:00
parent 52e705c4dd
commit 4ac47cdd86
6 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Sun Aug 22 15:49:10 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in: add check for zlib for building psp plugin
* plug-ins/common/mkgen.pl
* plug-ins/common/plugin-defs.pl
* plug-ins/common/Makefile.am: add psp plugin
* plug-ins/common/mail.c: removed double gimp_destroy_params, fixing
a segfault
1999-08-22 Tor Lillqvist <tml@iki.fi>
* plug-ins/common/psp.c: Use g_message, not gimp_message.

17
configure.in
View file

@ -95,7 +95,7 @@ ALL_LINGUAS="fr sv ja it fi ko de hu nl pl ru no cs"
AM_GNU_GETTEXT
dnl Check for GTK+
AM_PATH_GTK(1.2.3,,
AM_PATH_GTK(1.2.1,,
AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
changequote(,)dnl
@ -238,8 +238,17 @@ dnl Test for libjpeg
fi
fi
dnl Test for libz
if test -z "$LIBZ"; then
AC_CHECK_LIB(z, gzsetparams,
AC_CHECK_HEADER(zlib.h,
PSP='psp'; LIBZ='-lz',
AC_MSG_WARN(*** PSP and PNG plug-ins will not be built (ZLIB header files not found) ***)),
AC_MSG_WARN(*** PSP and PNG plug-ins will not be built (ZLIB library not found) ***))
fi
dnl Test for libpng
if test -z "$LIBPNG"; then
if test -z "$LIBPNG" && test -n "$LIBZ"; then
AC_CHECK_LIB(png, png_read_info,
AC_CHECK_HEADER(png.h,
png_ok=yes,
@ -253,7 +262,7 @@ dnl Test for libpng
png_ok=no)
AC_MSG_RESULT($png_ok)
if test "$png_ok" = yes; then
PNG='png'; LIBPNG='-lpng -lz'
PNG='png'; LIBPNG="-lpng $LIBZ"
else
AC_MSG_WARN(*** PNG plug-in will not be built (PNG library is too old) ***)
fi
@ -587,6 +596,8 @@ AC_SUBST(LIBTIFF)
AC_SUBST(JPEG)
AC_SUBST(XJT)
AC_SUBST(LIBJPEG)
AC_SUBST(PSP)
AC_SUBST(LIBZ)
AC_SUBST(PNG)
AC_SUBST(LIBPNG)
AC_SUBST(AA)

23
plug-ins/common/Makefile.am
View file

@ -97,6 +97,7 @@ libexec_PROGRAMS = \
polar \
ps \
psd \
$(PSP) \
randomize \
ripple \
rotate \
@ -137,6 +138,7 @@ EXTRA_PROGRAMS = \
jpeg \
mpeg \
png \
psp \
tiff \
xpm
@ -169,7 +171,7 @@ aa_SOURCES = \
aa_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBAA) \
$(LIBAA) \
$(GTK_LIBS) \
$(INTLLIBS)
@ -602,7 +604,7 @@ jpeg_SOURCES = \
jpeg_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBJPEG) \
$(LIBJPEG) \
$(GTK_LIBS) \
$(INTLLIBS)
@ -660,7 +662,7 @@ mpeg_SOURCES = \
mpeg_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBMPEG) \
$(LIBMPEG) \
$(GTK_LIBS) \
$(INTLLIBS)
@ -782,7 +784,7 @@ png_SOURCES = \
png_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBPNG) \
$(LIBPNG) \
$(GTK_LIBS) \
$(INTLLIBS)
@ -818,6 +820,15 @@ psd_LDADD = \
$(GLIB_LIBS) \
$(INTLLIBS)
psp_SOURCES = \
psp.c
psp_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBZ) \
$(GTK_LIBS) \
$(INTLLIBS)
randomize_SOURCES = \
randomize.c
@ -969,7 +980,7 @@ tiff_SOURCES = \
tiff_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBTIFF) \
$(LIBTIFF) \
$(GTK_LIBS) \
$(INTLLIBS)
@ -1075,7 +1086,7 @@ xpm_SOURCES = \
xpm_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(LIBXPM) \
$(LIBXPM) \
$(GTK_LIBS) \
$(INTLLIBS)

14
plug-ins/common/mail.c
View file

@ -470,17 +470,11 @@ save_dialog ()
PARAM_END);
/* check to see if we actually got a value */
if (return_vals[0].data.d_status != STATUS_SUCCESS || return_vals[1].data.d_string == NULL)
{
gimp_destroy_params (return_vals, nreturn_vals);
}
else
{
strncpy (mail_info.from, return_vals[1].data.d_string , 256);
}
if (return_vals[0].data.d_status == STATUS_SUCCESS &&
return_vals[1].data.d_string != NULL)
strncpy (mail_info.from, return_vals[1].data.d_string , 256);
gimp_destroy_params (return_vals, nreturn_vals);
gimp_destroy_params (return_vals, nreturn_vals);
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), _("Send to mail"));

3
plug-ins/common/mkgen.pl
View file

@ -68,7 +68,8 @@ foreach (sort keys %plugins) {
my $optlib = "";
if (exists $plugins{$_}->{optional}) {
$optlib = "\n\t\$(LIB\U$_\E)\t\\";
my $name = exists $plugins{$_}->{libopt} ? $plugins{$_}->{libopt} : $_;
$optlib = "\n\t\$(LIB\U$name\E)\t\t\t\t\\";
}
if (exists $plugins{$_}->{libsupp}) {

1
plug-ins/common/plugin-defs.pl
View file

@ -81,6 +81,7 @@
'polar' => { libdep => 'gtk' },
'ps' => { libdep => 'gtk' },
'psd' => { libdep => 'glib' },
'psp' => { libdep => 'gtk', optional => 1, libopt => 'z' },
'randomize' => { libdep => 'gtk', libsupp => 'gpc' },
'ripple' => { libdep => 'gtk' },
'rotate' => { libdep => 'gtk' },