Re: New release of gtk: problems compiling.

[Owen Taylor <owt1 cornell edu>]

Christopher Blizzard <blizzard@appliedtheory.com> writes:

> With my daily checkout of the gnome code, I discovered that imlib
> doesn't build anymore.  This is because glib.h ( installed in
> /usr/include ) requires glibconfig.h which is not installed.  This may
> be in error, I'm not sure.  Just FYI anything that does an #include
> <glib.h> will fail.  I just checked this version of gtk out of CVS.

To clear up the confusion:

As noted in the release announcement for 0.99.6, glibconfig.h is now
installed in $exec_prefix/lib/glib/include.  (default
/usr/local/lib/glib/include) If you don't get errors from this, you
didn't remove the old copy from $includedir.

For a convenient way to get things right, see docs/gtk-config.txt

(There is a typo where GDK_LIBS is written instead of GTK_LIBS
 in that document, so watch out for that)

I've put a patch for imlib below. Hopefully, we'll get all
of GNOME updated fairly soon.

                                        Owen

Index: Makefile.am
===================================================================
RCS file: /debian/home/gnomecvs/imlib/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- Makefile.am	1998/02/24 20:29:01	1.1
+++ Makefile.am	1998/03/15 19:07:04
@@ -1,2 +1,2 @@
-SUBDIRS = gdk_imlib Imlib utils config
+SUBDIRS = @GDK_IMLIB@ Imlib config
 #SUBDIRS = gdk_imlib Imlib
Index: configure.in
===================================================================
RCS file: /debian/home/gnomecvs/imlib/configure.in,v
retrieving revision 1.2
diff -u -r1.2 configure.in
--- configure.in	1998/02/25 01:36:38	1.2
+++ configure.in	1998/03/15 19:07:04
@@ -8,6 +8,13 @@
 AC_PROG_RANLIB
 AC_PROG_CC
 
+AM_PATH_GTK(0.99.6,
+   GDK_IMLIB="gdk_imlib utils",
+   GDK_IMLIB=""
+   AC_MSG_WARN([*** gdk_imlib will not be built ***]))
+
+AC_SUBST(GDK_IMLIB)
+
 AC_PATH_PROG(DJPEG_PROG, djpeg)
 
 AC_PATH_PROG(CONVERT_PROG, convert)
Index: gdk_imlib/Makefile.am
===================================================================
RCS file: /debian/home/gnomecvs/imlib/gdk_imlib/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- Makefile.am	1998/03/12 06:02:50	1.6
+++ Makefile.am	1998/03/15 19:07:04
@@ -31,4 +31,4 @@
 DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" \
 	 -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\"
 
-INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
+INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(GTK_CFLAGS) $(X_CFLAGS)
Index: utils/Makefile.am
===================================================================
RCS file: /debian/home/gnomecvs/imlib/utils/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- Makefile.am	1998/02/25 17:54:30	1.4
+++ Makefile.am	1998/03/15 19:07:04
@@ -1,10 +1,10 @@
 INCLUDES = -I. -I$(srcdir) \
 	-I$(top_builddir)/gdk_imlib -I$(top_srcdir)/gdk_imlib \
-	$(X_CFLAGS)
+	$(GTK_CFLAGS)
 
 bin_PROGRAMS = imlib_config
 
 imlib_config_SOURCES = imlib_config.c icons.c testimg.c
 
-LDADD = ../gdk_imlib/libgdk_imlib.la ../Imlib/libImlib.la \
-	-lglib -lgdk -lgtk $(X_LIBS) $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
+LDADD = ../gdk_imlib/libgdk_imlib.la ../Imlib/libImlib.la $(GTK_LIBS)
+