Commit 0ff86134 authored by Manish Singh's avatar Manish Singh

use gtk-config now. Note this in the HACKING file.

quell another gtk warning.

-Yosh
parent cfdf1a99
Fri Mar 13 21:11:59 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: use gtk-config now
* app/gimage.c: gtk is paranoid. Must appease the warning gods.
Sat Mar 14 00:50:31 1998 Tim Janik <timj@gimp.org>
* plug-ins/script-fu/script-fu-scripts.c: only destroy the dialog at
......
......@@ -2,7 +2,7 @@ If you want to hack on the GIMP project, it will make you life easier
to have the following packages installed:
- GNU autoconf 2.12
- GNU automake 1.2d
- GNU automake 1.2f
Available in ftp://ftp.cygnus.com/pub/tromey
- GNU libtool 1.0f
......@@ -10,12 +10,38 @@ These should be available by ftp from prep.ai.mit.edu or any of the
fine GNU mirrors. Beta software can be found at alpha.gnu.org.
If you are accessing gimp via CVS, then you will need to take several
steps to get it to compile. These are:
steps to get it to compile. You can do all these steps at once
by running:
cvsroot/gimp# aclocal; automake; autoconf
cvsroot/gimp# ./autogen.sh
N.b., the "configure" script will not exist until you take these
steps.
Basically this does the following for you:
Before running configure, make sure you have libtool in your path.
cvsroot/gimp# aclocal; automake; autoconf
The above commands create the "configure" script. Now you
can run the configure script in cvsroot/gtk+ to create all
the Makefiles.
Before running autogen.sh or configure, make sure you have libtool
in your path. Also make sure gtk.m4 is in the same --prefix relative
to your automake installation.
Note that autogen.sh runs configure for you. If you wish to pass
options like --prefix=/usr to configure you can give those options
to autogen.sh and they will be passed on to configure.
If at all possible, please use CVS to get the latest development version of
gimp, as well as the CVS version of gtk+. You can do the following to get
gimp and gtk+ from cvs:
$ export CVSROOT=':pserver:anonymous@cvs.gimp.org:/debian/home/gnomecvs'
$ cvs login
(there is no password, just hit return)
$ cvs -z9 checkout gtk+ gimp
Please submit patches to the gimp-developer@scam.xcf.berkeley.edu mailing
list. All kinds of contributions are accepted. Patches that you wish to go
into the distribution should also be uploaded to ftp://ftp.gimp.org/incoming.
Follow the rules there for naming your patches.
......@@ -2287,7 +2287,7 @@ gimage_remove_layer_mask (GImage *gimage, Layer *layer, int mode)
/* Push the undo--Important to do it here, AFTER the call
* to layer_apply_mask, in case the undo push fails and the
* mask is deleted
* mask is delete : NULL)d
*/
undo_push_layer_mask (gimage, lmu);
......@@ -2305,7 +2305,7 @@ gimage_remove_layer_mask (GImage *gimage, Layer *layer, int mode)
}
gdisplays_flush ();
return GIMP_CHANNEL (layer->mask);
return NULL;
}
......
......@@ -42,46 +42,12 @@ fi)
AC_DEFUN(AC_GIMP_CHECK,
[
AC_PATH_X
AC_PATH_XTRA
saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS"
CFLAGS="$X_CFLAGS $CFLAGS"
LDFLAGS="$X_LDFLAGS $X_LIBS $LDFLAGS"
dnl Checks for libraries.
AC_CHECK_LIB(X11, XOpenDisplay,
x_libs="-lX11 $X_EXTRA_LIBS",
[AC_MSG_ERROR(No X11 installed)],
$X_EXTRA_LIBS)
LD_FLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS $x_libs"
AC_CHECK_LIB(Xext, XShmAttach,
x_libs="-lXext $x_libs", ,
$x_libs)
X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm"
LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS"
dnl Dont cache this as it depends on CFLAGS, LDFLAGS, etc
AC_MSG_CHECKING([for gtk >= 0.99.5])
AC_TRY_LINK(
[#include <gtk/gtk.h>],
[gtk_preview_reset();],
gtk_found=yes,
gtk_found=no)
AC_MSG_RESULT($gtk_found)
if test $gtk_found = no; then
AC_MSG_ERROR(Cannot include/link gtk/gdk/glib--check CFLAGS/LDFLAGS)
fi
dnl CFLAGS="$saved_cflags"
dnl LDFLAGS="$saved_ldflags"
AM_PATH_GTK(0.99.5,,
AC_MSG_ERROR(Cannot include/link gtk/gdk/glib--check CFLAGS/LDFLAGS))
X_LIBS=$GTK_LIBS
X_CFLAGS=$GTK_CFLAGS
AC_SUBST(X_LIBS)
AC_SUBST(X_CFLAGS)
])
if test -n "$DEBUGFLAG"; then
......@@ -96,6 +62,12 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_GIMP_CHECK
gimp_save_CFLAGS="$CFLAGS"
gimp_save_LIBS="$LIBS"
CFLAGS="$GTK_CFLAGS $CFLAGS"
LIBS="$LIBS $GTK_LIBS"
if eval "test x$GCC = xyes"; then
if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then
CFLAGS="$CFLAGS"
......@@ -236,6 +208,9 @@ fi
dnl TVM: check for compiler characteristics
AC_C_INLINE
CFLAGS="$gimp_save_CFLAGS"
LIBS="$gimp_save_LIBS"
gimpdatadir=$datadir/gimp
gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment