Make gnomeui the last library on the command line, as its path is the one

2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* configure.in: Make gnomeui the last library on the command line,
	as its path is the one most likely to hold other old libraries
	(libxml) and we need newer versions.

svn path=/trunk/; revision=1844

4 files changed, 28 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c5bbc2a94..a5f24d7f26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,19 @@
 2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
-	* configure.in (have_pthread): Use the new method for gnome-print
+	* configure.in: Make gnomeui the last library on the command line,
+	as its path is the one most likely to hold other old libraries
+	(libxml) and we need newer versions.
+	
+	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
+	AC_CONFIG_SUBDIRS 
+
+	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
+	go before we rquery them. 
+
+	Use the new method for gnome-print
 	checking instead of the old crufty gtk+ based one that nobody can
 	debug.  ever.
-
+	
 2000-02-17  Dan Winship  <danw@helixcode.com>
 
 	* camel/camel-service.h:
diff --git a/configure.in b/configure.in
index ed543a3b83..1970d969db 100644
--- a/configure.in
+++ b/configure.in
@@ -160,20 +160,20 @@ AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
 
-EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` $THREADS_LIBS `unicode-config --libs`"
-EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` $THREADS_CFLAGS `unicode-config --cflags`"
+EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $THREADS_LIBS `unicode-config --libs`"
+EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $THREADS_CFLAGS `unicode-config --cflags`"
 
 AC_SUBST(EXTRA_GNOME_LIBS)
 AC_SUBST(EXTRA_GNOME_CFLAGS)
 
 
-BONOBO_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf `"
-BONOBO_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf `"
+BONOBO_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui`"
+BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui `"
 AC_SUBST(BONOBO_GNOME_LIBS)
 AC_SUBST(BONOBO_GNOME_CFLAGS)
 
-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf ` `glib-config --libs gthread`"
-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf ` `glib-config --cflags gthread`"
+BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` `glib-config --libs gthread`"
+BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` `glib-config --cflags gthread`"
 AC_SUBST(BONOBO_HTML_GNOME_LIBS)
 AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
 
@@ -194,8 +194,8 @@ else
 	AC_MSG_ERROR(GNOME-VFS is required to compile Evolution)
 fi
 
-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
+BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
+BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
 AC_SUBST(BONOBO_VFS_GNOME_LIBS)
 AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)
 
diff --git a/libical/Makefile b/libical/Makefile
index 97ea715bbf..226637ac9e 100644
--- a/libical/Makefile
+++ b/libical/Makefile
@@ -3,7 +3,7 @@ VERSION = 0.15
 DISTNAME = libical
 SUBDIRS = src
 
-prefix = /usr/local
+prefix = /home/miguel
 PREFIX = ${prefix}
 EXEC_PREFIX = ${prefix}
 BIN_DIR = $(EXEC_PREFIX)/bin
diff --git a/libical/config.status b/libical/config.status
index 9570dc9bbc..c957041e8c 100755
--- a/libical/config.status
+++ b/libical/config.status
@@ -2,9 +2,9 @@
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
 # This directory was configured as follows,
-# on host twitch:
+# on host papaya.nuclecu.unam.mx:
 #
-# ./configure 
+# ./configure  --prefix=/home/miguel --cache-file=.././config.cache --srcdir=.
 #
 # Compiler output produced by configure, useful for debugging
 # configure, is in ./config.log if it exists.
@@ -14,8 +14,8 @@ for ac_option
 do
   case "$ac_option" in
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion"
-    exec ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion ;;
+    echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --prefix=/home/miguel --cache-file=.././config.cache --srcdir=. --no-create --no-recursion"
+    exec ${CONFIG_SHELL-/bin/sh} ./configure  --prefix=/home/miguel --cache-file=.././config.cache --srcdir=. --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "./config.status generated by autoconf version 2.13"
     exit 0 ;;
@@ -36,15 +36,15 @@ sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
 /^[ 	]*VPATH[ 	]*=[^:]*$/d
 
 s%@SHELL@%/bin/sh%g
-s%@CFLAGS@%-g%g
+s%@CFLAGS@%-g -O2%g
 s%@CPPFLAGS@%%g
-s%@CXXFLAGS@%-g%g
+s%@CXXFLAGS@%%g
 s%@FFLAGS@%%g
 s%@DEFS@% -DSTDC_HEADERS=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_TIME_H=1 -DHAVE_STDIO_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_ASSERT_H=1 -DHAVE_STRDUP=1 %g
 s%@LDFLAGS@%%g
 s%@LIBS@%%g
 s%@exec_prefix@%${prefix}%g
-s%@prefix@%/usr/local%g
+s%@prefix@%/home/miguel%g
 s%@program_transform_name@%s,x,x,%g
 s%@bindir@%${exec_prefix}/bin%g
 s%@sbindir@%${exec_prefix}/sbin%g