* build-glib1.sh: Fix misplaced --with-glib12. Copy

config.guess and config.sub from mc to glib sources - they are
too old in glib.
* build-glib2.sh: Update to the latest versions of glib, gettext
and pkg-config.

ChangeLog

@@ -1,3 +1,11 @@
+2006-12-28  Pavel Roskin  <proski@gnu.org>
+
+	* build-glib1.sh: Fix misplaced --with-glib12.  Copy
+	config.guess and config.sub from mc to glib sources - they are
+	too old in glib.
+	* build-glib2.sh: Update to the latest versions of glib, gettext
+	and pkg-config.
+
 2006-11-27  Leonard den Ottolander  <leonard den ottolander nl>
 
 	* NEWS: Bash < 2.05b (3-digit octals in echo_e_cmd) no longer

build-glib1.sh

@@ -55,14 +55,17 @@ if test -f glist.c; then : ; else
   exit 1
 fi
 
+cp ../config/config.guess .
+cp ../config/config.sub .
+
 rm -rf "$GLIB_INSTDIR"
-./configure --disable-shared --with-glib12 --prefix="$GLIB_INSTDIR" || exit 1
+./configure --disable-shared --prefix="$GLIB_INSTDIR" || exit 1
 make all || exit 1
 make install || exit 1
 
 cd "$MC_TOPDIR"
 ./configure GLIB_CONFIG="$GLIB_INSTDIR/bin/glib-config" \
-	    PKG_CONFIG=/bin/false "$@" || exit 1
+	    PKG_CONFIG=/bin/false --with-glib12 "$@" || exit 1
 make clean || exit 1
 make || exit 1
 

build-glib2.sh

@@ -26,19 +26,19 @@
 
 : ${MC_TOPDIR=`pwd`}
 : ${TMP_INSTDIR=$MC_TOPDIR/tmp-inst}
-: ${GLIB_VERSION=2.2.3}
-: ${PKGC_VERSION=0.15.0}
-: ${GETTEXT_VERSION=0.11.5}
+: ${GLIB_VERSION=2.12.6}
+: ${PKGC_VERSION=0.21}
+: ${GETTEXT_VERSION=0.16.1}
 
 GLIB_DIR="glib-$GLIB_VERSION"
 GLIB_TARBALL="glib-$GLIB_VERSION.tar.gz"
-GLIB_URL="ftp://ftp.gtk.org/pub/gtk/v2.2/$GLIB_TARBALL"
+GLIB_URL="ftp://ftp.gtk.org/pub/glib/2.12/$GLIB_TARBALL"
 
-PKGC_DIR="pkgconfig-$PKGC_VERSION"
-PKGC_TARBALL="pkgconfig-$PKGC_VERSION.tar.gz"
-PKGC_URL="http://www.freedesktop.org/software/pkgconfig/releases/$PKGC_TARBALL"
+PKGC_DIR="pkg-config-$PKGC_VERSION"
+PKGC_TARBALL="pkg-config-$PKGC_VERSION.tar.gz"
+PKGC_URL="http://pkgconfig.freedesktop.org/releases/$PKGC_TARBALL"
 
-GETTEXT_DIR="gettext-$GETTEXT_VERSION"
+GETTEXT_DIR="gettext-$GETTEXT_VERSION/gettext-runtime"
 GETTEXT_TARBALL="gettext-$GETTEXT_VERSION.tar.gz"
 GETTEXT_URL="ftp://ftp.gnu.org/gnu/gettext/$GETTEXT_TARBALL"