--- gnome-libs-1.4.2/libart_lgpl/gen_art_config.c	2002-01-10 22:31:18.000000000 +0000
+++ gnome-libs-1.4.2/libart_lgpl/gen_art_config.c	2007-10-24 17:46:51.000000000 +0100
@@ -24,12 +24,12 @@
 {
   printf ("/* Automatically generated by gen_art_config.c */\n"
 	  "\n"
-	  "#define ART_SIZEOF_CHAR %d\n"
-	  "#define ART_SIZEOF_SHORT %d\n"
-	  "#define ART_SIZEOF_INT %d\n"
-	  "#define ART_SIZEOF_LONG %d\n"
+	  "#define ART_SIZEOF_CHAR %s\n"
+	  "#define ART_SIZEOF_SHORT %s\n"
+	  "#define ART_SIZEOF_INT %s\n"
+	  "#define ART_SIZEOF_LONG %s\n"
 	  "\n",
-	  sizeof(char), sizeof(short), sizeof(int), sizeof(long));
+	  "sizeof(char)", "sizeof(short)", "sizeof(int)", "sizeof(long)");
 
   if (sizeof(char) == 1)
     printf ("typedef unsigned char art_u8;\n");
--- gnome-libs-1.4.2/gnome-config.in	2001-03-05 22:17:43.000000000 +0000
+++ gnome-libs-1.4.2/gnome-config.in	2007-10-25 10:22:47.000000000 +0100
@@ -10,7 +10,7 @@
 sysconfdir=@sysconfdir@
 sharedstatedir=@sharedstatedir@
 localstatedir=@localstatedir@
-libdir=@libdir@
+libdir=`pkg-config --variable=libdir glib`
 infodir=@infodir@
 mandir=@mandir@
 includedir=@includedir@
@@ -173,19 +173,19 @@
 	the_flags="$the_flags `gtk-config --cflags`"
 	;;
     gnome)
-       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
+       	the_libs="$the_libs @GNOME_LIBDIR@ -lgnome -lgnomesupport `esd-config --libs` `audiofile-config --libs` `glib-config --libs`"
+  	the_flags="$the_flags @GNOME_INCLUDEDIR@ `gtk-config --cflags`"
 	;;
     gnomeui)
-	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
+	the_libs="$the_libs @GNOME_LIBDIR@ -lgnomeui -lart_lgpl `imlib-config --libs-gdk` -lSM -lICE `gtk-config --libs` -lgnome -lgnomesupport `esd-config --libs` `audiofile-config --libs` `glib-config --libs`"
+	the_flags="$the_flags @GNOME_INCLUDEDIR@ `gtk-config --cflags`"
 	;;
     gtkxmhtml)
-	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@"
+	the_libs="$the_libs @GNOME_LIBDIR@ -lgtkxmhtml -lXpm -ljpeg -lpng10 -lz -lSM -lICE `gtk-config --libs`"
 	;;
     gnorba)
-        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@"
-	the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@"
+        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba `orbit-config --use-service=name --libs client server`"
+	the_flags="$the_flags @GNOME_INCLUDEDIR@ `orbit-config --cflags client server`"
         ;;
     idl)
 	the_flags="-I${datadir}/idl"
@@ -194,7 +194,7 @@
 	done
 	;;
     zvt)
-	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ @GDK_IMLIB_LIBS@"
+	the_libs="$the_libs @GNOME_LIBDIR@ -lzvt -lutil -lSM -lICE `gtk-config --libs` `imlib-config --libs-gdk`"
 	;;
     libgtop)
 	the_libs="$the_libs `libgtop-config --libs --extra-libs`"
--- gnome-libs-1.4.2/libart_lgpl/libart-config.in	2001-09-24 21:18:09.000000000 +0100
+++ gnome-libs-1.4.2/libart_lgpl/libart-config.in	2007-10-25 09:02:08.000000000 +0100
@@ -4,7 +4,7 @@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 includedir=@includedir@
-libdir=@libdir@
+libdir=`pkg-config --variable=libdir glib`
 
 usage="\
 Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"