Fixed my mess-up, sorry about that.

svn path=/trunk/; revision=3151

5 files changed, 62 insertions, 11 deletions

diff --git a/macros/ChangeLog b/macros/ChangeLog
index 91d15f718f..e780a962d1 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,42 @@
+2000-05-15  Russell Steinthal  <rms39@columbia.edu>
+
+	* gnome-pilot.m4 (PILOT_LIBS): An attempt to fix the gnome-pilot
+	check on Solaris (`$GNOME_CONFIG ...` returns more than one word,
+	so we need quotes around it to keep test from bombing out)
+
+2000-05-01  Dan Winship  <danw@helixcode.com>
+
+	* gnome-pilot.m4 (PILOT_LIBS): "But that trick NEVER works!"
+	"This time for sure!"
+
+Sun Apr 23 12:15:14 2000  George Lebl <jirka@5z.com>
+
+	* gnome.m4: add an extra lib of docklets.  These checks are
+	  braindamaged though, they don't fail and thus gnome-core for
+	  example compiles without gnomecc.  There need to be separate .m4
+	  files or checks
+
+2000-04-19  Eskil Heyn Olsen  <deity@eskil.dk>
+
+	* gnome-pilot.m4 (PILOT_LIBS): Changed the error string for gnome-pilot
+	(PILOT_LIBS): Fixes the gnome-config check
+
+2000-04-10  Dan Winship  <danw@helixcode.com>
+
+	* gnome-pilot.m4 (PILOT_LIBS): Fix a bug introduced in the
+	gnome-pilot-config to "gnome-config gpilot" change that caused not
+	having pilot-link installed to become a fatal error.
+
+2000-02-26  James Henstridge  <james@daa.com.au>
+
+	* gnome-gettext.m4: fix up check of LINGUAS variable so that we don't
+	get problems when LINGUAS contains `en' and ALL_LINGUAS contains
+	`en_GB' for instance.
+
+2000-02-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* autogen.sh: Don't run libtoolize when `NO_LIBTOOLIZE' is set.
+
 2000-02-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* autogen.sh: Fix GNUism introduced in the previous fix.
diff --git a/macros/autogen.sh b/macros/autogen.sh
index f08dc52149..18cfd60720 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -105,7 +105,7 @@ do
       aclocalinclude="$ACLOCAL_FLAGS"
       for k in $aclocalinclude; do
   	if test -d $k; then
-	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1.0" ]; then
+	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
 	    rm -f $DELETEFILES
 	  fi
         fi
@@ -113,7 +113,7 @@ do
       for k in $macrodirs; do
   	if test -d $k; then
           aclocalinclude="$aclocalinclude -I $k"
-	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1.0" ]; then
+	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
 	    rm -f $DELETEFILES
 	  fi
         fi
@@ -139,8 +139,10 @@ do
 	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	echo "Running libtoolize..."
-	libtoolize --force --copy
+	if test -z "$NO_LIBTOOLIZE" ; then 
+	  echo "Running libtoolize..."
+	  libtoolize --force --copy
+	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
diff --git a/macros/gnome-gettext.m4 b/macros/gnome-gettext.m4
index 1dac989cbb..3ebd6d41bc 100644
--- a/macros/gnome-gettext.m4
+++ b/macros/gnome-gettext.m4
@@ -249,7 +249,7 @@ strdup __argz_count __argz_stringify __argz_next])
        fi
        for lang in $LINGUAS; do
          case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+          *\ $lang\ *|$lang\ *|*\ $lang) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
          esac
        done
        LINGUAS=$NEW_LINGUAS
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index 16e081a366..39f73cca9e 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -97,23 +97,29 @@ AC_DEFUN([PILOT_LINK_CHECK],[
 ])
 
 AC_DEFUN([GNOME_PILOT_HOOK],[
-	AC_PATH_PROG(GNOME_PILOT_CONFIG,gnome-pilot-config,no)
+	AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
 	AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
-		if test x$GNOME_PILOT_CONFIG = xno; then
+		if test "x$GNOME_CONFIG" = "xno"; then
 			gnome_cv_pilot_found=no
 		else
-			gnome_cv_pilot_found=yes
+			# gnome-config doesn't return a useful error status,
+			# so we check if it outputs anything to stderr
+			if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
+				gnome_cv_pilot_found=yes
+			else
+				gnome_cv_pilot_found=no
+			fi
 		fi
 	])
 	AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)
 	if test x$gnome_cv_pilot_found = xyes; then
 		PILOT_LINK_CHECK($1)
-		GNOME_PILOT_CFLAGS=`gnome-pilot-config --cflags client conduitmgmt`
-		GNOME_PILOT_LIBS=`gnome-pilot-config --libs client conduitmgmt`
+		GNOME_PILOT_CFLAGS=`gnome-config --cflags gpilot`
+		GNOME_PILOT_LIBS=`gnome-config --libs gpilot`
 		$2
 	else
 		if test x$3 = xfailure; then
-			AC_MSG_ERROR(Gnome-pilot not installed or installation problem)
+			AC_MSG_ERROR(gnome-pilot development package not installed or installation problem)
 		fi
 	fi
 ])
diff --git a/macros/gnome.m4 b/macros/gnome.m4
index a3a9ca7407..659c22c494 100644
--- a/macros/gnome.m4
+++ b/macros/gnome.m4
@@ -104,6 +104,10 @@ AC_DEFUN([GNOME_INIT_HOOK],[
 		AC_SUBST(GNOME_APPLETS_LIBS)
 		GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
 		AC_MSG_RESULT($GNOME_APPLETS_LIBS);;
+	      docklets)
+		AC_SUBST(GNOME_DOCKLETS_LIBS)
+		GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
+		AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);;
 	      capplet)
 		AC_SUBST(GNOME_CAPPLET_LIBS)
 		GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`