diff -uNr gnome-0.6/configure gnome-0.7/configure
--- gnome-0.6/configure	Mon Sep 29 23:52:31 1997
+++ gnome-0.7/configure	Thu Oct  2 23:07:03 1997
@@ -538,7 +538,7 @@
 
 
 
-VERSION=0.6
+VERSION=0.7
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"
@@ -1224,68 +1224,11 @@
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1239: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1289: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1232: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1312,7 +1255,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1316: checking how to run the C preprocessor" >&5
+echo "configure:1259: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1327,13 +1270,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1331 "configure"
+#line 1274 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1344,13 +1287,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1348 "configure"
+#line 1291 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1373,12 +1316,12 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1377: checking for ANSI C header files" >&5
+echo "configure:1320: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1382 "configure"
+#line 1325 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1386,7 +1329,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1403,7 +1346,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1407 "configure"
+#line 1350 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1421,7 +1364,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1425 "configure"
+#line 1368 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1442,7 +1385,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1446 "configure"
+#line 1389 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1453,7 +1396,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1571,7 +1514,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1575: checking for X" >&5
+echo "configure:1518: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1633,12 +1576,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1637 "configure"
+#line 1580 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1707,14 +1650,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1711 "configure"
+#line 1654 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -1820,17 +1763,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:1824: checking whether -R must be followed by a space" >&5
+echo "configure:1767: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 1827 "configure"
+#line 1770 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -1846,14 +1789,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 1793 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -1885,7 +1828,7 @@
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:1889: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:1832: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1893,7 +1836,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1897 "configure"
+#line 1840 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1904,7 +1847,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1926,7 +1869,7 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:1930: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:1873: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1934,7 +1877,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1938 "configure"
+#line 1881 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1945,7 +1888,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1974,12 +1917,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1978: checking for gethostbyname" >&5
+echo "configure:1921: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1983 "configure"
+#line 1926 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2002,7 +1945,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -2023,7 +1966,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2027: checking for gethostbyname in -lnsl" >&5
+echo "configure:1970: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2031,7 +1974,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2035 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2042,7 +1985,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2072,12 +2015,12 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2076: checking for connect" >&5
+echo "configure:2019: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2081 "configure"
+#line 2024 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2100,7 +2043,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -2121,7 +2064,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2125: checking for connect in -lsocket" >&5
+echo "configure:2068: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2129,7 +2072,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2133 "configure"
+#line 2076 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2140,7 +2083,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2164,12 +2107,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2168: checking for remove" >&5
+echo "configure:2111: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2173 "configure"
+#line 2116 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2192,7 +2135,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -2213,7 +2156,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2217: checking for remove in -lposix" >&5
+echo "configure:2160: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2221,7 +2164,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2225 "configure"
+#line 2168 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2232,7 +2175,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2256,12 +2199,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2260: checking for shmat" >&5
+echo "configure:2203: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2265 "configure"
+#line 2208 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2284,7 +2227,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -2305,7 +2248,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2309: checking for shmat in -lipc" >&5
+echo "configure:2252: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2313,7 +2256,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2317 "configure"
+#line 2260 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2324,7 +2267,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2357,7 +2300,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2361: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2304: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2365,7 +2308,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2369 "configure"
+#line 2312 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2376,7 +2319,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2402,7 +2345,7 @@
 
 
 		echo $ac_n "checking for XPutImage in -lX11""... $ac_c" 1>&6
-echo "configure:2406: checking for XPutImage in -lX11" >&5
+echo "configure:2349: checking for XPutImage in -lX11" >&5
 ac_lib_var=`echo X11'_'XPutImage | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2410,7 +2353,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 -L$x_libraries $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2357 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2421,7 +2364,7 @@
 XPutImage()
 ; return 0; }
 EOF
-if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2443,7 +2386,7 @@
 fi
 
 	echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
-echo "configure:2447: checking for XShmAttach in -lXext" >&5
+echo "configure:2390: checking for XShmAttach in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2451,7 +2394,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext -L$x_libraries $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2455 "configure"
+#line 2398 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2462,7 +2405,7 @@
 XShmAttach()
 ; return 0; }
 EOF
-if { (eval echo configure:2466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2485,7 +2428,7 @@
 	
 	x_libraries="$x_libraries -lgdk -lglib -lm"
 	echo $ac_n "checking for gtk_button_new in -lgtk""... $ac_c" 1>&6
-echo "configure:2489: checking for gtk_button_new in -lgtk" >&5
+echo "configure:2432: checking for gtk_button_new in -lgtk" >&5
 ac_lib_var=`echo gtk'_'gtk_button_new | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2493,7 +2436,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgtk -L$x_libraries $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2497 "configure"
+#line 2440 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2504,7 +2447,7 @@
 gtk_button_new()
 ; return 0; }
 EOF
-if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2534,7 +2477,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2538: checking for $ac_word" >&5
+echo "configure:2481: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2565,7 +2508,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2569: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2512: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2575,11 +2518,11 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 2579 "configure"
+#line 2522 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:2583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2605,12 +2548,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2609: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2552: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:2614: checking whether we are using GNU C++" >&5
+echo "configure:2557: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2619,7 +2562,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -2634,7 +2577,7 @@
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2638: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2581: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2607,7 @@
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2611: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2697,7 +2640,7 @@
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2701: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2644: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2705,7 +2648,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2709 "configure"
+#line 2652 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2716,7 +2659,7 @@
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2739,7 +2682,7 @@
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:2743: checking lex output file root" >&5
+echo "configure:2686: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2760,7 +2703,7 @@
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:2764: checking whether yytext is a pointer" >&5
+echo "configure:2707: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2772,14 +2715,14 @@
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 2776 "configure"
+#line 2719 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -2806,12 +2749,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2810: checking for working const" >&5
+echo "configure:2753: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2815 "configure"
+#line 2758 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2860,7 +2803,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2881,21 +2824,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2885: checking for inline" >&5
+echo "configure:2828: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2892 "configure"
+#line 2835 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2921,12 +2864,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2925: checking for off_t" >&5
+echo "configure:2868: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2930 "configure"
+#line 2873 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2954,12 +2897,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2958: checking for size_t" >&5
+echo "configure:2901: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2963 "configure"
+#line 2906 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2989,19 +2932,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2993: checking for working alloca.h" >&5
+echo "configure:2936: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2998 "configure"
+#line 2941 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -3022,12 +2965,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:3026: checking for alloca" >&5
+echo "configure:2969: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3031 "configure"
+#line 2974 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -3050,7 +2993,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -3082,12 +3025,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:3086: checking whether alloca needs Cray hooks" >&5
+echo "configure:3029: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3091 "configure"
+#line 3034 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -3112,12 +3055,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3116: checking for $ac_func" >&5
+echo "configure:3059: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3121 "configure"
+#line 3064 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3140,7 +3083,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3167,7 +3110,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3171: checking stack direction for C alloca" >&5
+echo "configure:3114: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3175,7 +3118,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3179 "configure"
+#line 3122 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -3194,7 +3137,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -3219,17 +3162,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3223: checking for $ac_hdr" >&5
+echo "configure:3166: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3228 "configure"
+#line 3171 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3258,12 +3201,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3262: checking for $ac_func" >&5
+echo "configure:3205: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3267 "configure"
+#line 3210 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3286,7 +3229,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3311,7 +3254,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3315: checking for working mmap" >&5
+echo "configure:3258: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3319,7 +3262,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
+#line 3266 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3459,7 +3402,7 @@
 }
 
 EOF
-if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3486,17 +3429,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3490: checking for $ac_hdr" >&5
+echo "configure:3433: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3495 "configure"
+#line 3438 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3525,12 +3468,12 @@
    for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3529: checking for $ac_func" >&5
+echo "configure:3472: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3534 "configure"
+#line 3477 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3553,7 +3496,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3582,12 +3525,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3586: checking for $ac_func" >&5
+echo "configure:3529: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3591 "configure"
+#line 3534 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3610,7 +3553,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3644,19 +3587,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3648: checking for LC_MESSAGES" >&5
+echo "configure:3591: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'ud_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3653 "configure"
+#line 3596 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ud_cv_val_LC_MESSAGES=yes
 else
@@ -3677,7 +3620,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3681: checking whether NLS is requested" >&5
+echo "configure:3624: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3694,7 +3637,7 @@
 EOF
 
       echo $ac_n "checking for explicitly using GNU gettext""... $ac_c" 1>&6
-echo "configure:3698: checking for explicitly using GNU gettext" >&5
+echo "configure:3641: checking for explicitly using GNU gettext" >&5
       # Check whether --with-gnu-gettext or --without-gnu-gettext was given.
 if test "${with_gnu_gettext+set}" = set; then
   withval="$with_gnu_gettext"
@@ -3709,7 +3652,7 @@
         nls_cv_use_gnu_gettext=yes
       else
                                 echo $ac_n "checking for main in -lintl""... $ac_c" 1>&6
-echo "configure:3713: checking for main in -lintl" >&5
+echo "configure:3656: checking for main in -lintl" >&5
 ac_lib_var=`echo intl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3717,14 +3660,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3721 "configure"
+#line 3664 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3752,7 +3695,7 @@
 fi
 
         echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3756: checking for main in -li" >&5
+echo "configure:3699: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3760,14 +3703,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3764 "configure"
+#line 3707 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3796,12 +3739,12 @@
 
         CATOBJEXT=NONE
         echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:3800: checking for gettext" >&5
+echo "configure:3743: checking for gettext" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3805 "configure"
+#line 3748 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gettext(); below.  */
@@ -3824,7 +3767,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gettext=yes"
 else
@@ -3845,7 +3788,7 @@
            # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3849: checking for $ac_word" >&5
+echo "configure:3792: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3882,12 +3825,12 @@
 	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3886: checking for $ac_func" >&5
+echo "configure:3829: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3891 "configure"
+#line 3834 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3910,7 +3853,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3937,7 +3880,7 @@
 	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3941: checking for $ac_word" >&5
+echo "configure:3884: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3974,7 +3917,7 @@
 	     # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3978: checking for $ac_word" >&5
+echo "configure:3921: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4019,12 +3962,12 @@
 
         if test "$CATOBJEXT" = "NONE"; then
                     echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:4023: checking for catgets" >&5
+echo "configure:3966: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4028 "configure"
+#line 3971 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -4047,7 +3990,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -4069,7 +4012,7 @@
              # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4073: checking for $ac_word" >&5
+echo "configure:4016: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4103,7 +4046,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4107: checking for $ac_word" >&5
+echo "configure:4050: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4138,7 +4081,7 @@
 	       # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4142: checking for $ac_word" >&5
+echo "configure:4085: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4197,7 +4140,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4201: checking for $ac_word" >&5
+echo "configure:4144: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4234,7 +4177,7 @@
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4238: checking for $ac_word" >&5
+echo "configure:4181: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4271,7 +4214,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4275: checking for $ac_word" >&5
+echo "configure:4218: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4348,7 +4291,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4352: checking for catalogs to be installed" >&5
+echo "configure:4295: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4368,17 +4311,17 @@
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4372: checking for linux/version.h" >&5
+echo "configure:4315: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4377 "configure"
+#line 4320 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4428,7 +4371,7 @@
 
 
 echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:4432: checking for main in -lm" >&5
+echo "configure:4375: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4436,14 +4379,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4440 "configure"
+#line 4383 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4471,7 +4414,7 @@
 fi
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4475: checking for dlopen in -ldl" >&5
+echo "configure:4418: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4479,7 +4422,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4483 "configure"
+#line 4426 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4490,7 +4433,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4510,23 +4453,27 @@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
-echo "configure:4515: checking for main in -lqt" >&5
-ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for qt_abort in -lqt""... $ac_c" 1>&6
+echo "configure:4458: checking for qt_abort in -lqt" >&5
+ac_lib_var=`echo qt'_'qt_abort | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lqt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4523 "configure"
+#line 4466 "configure"
 #include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char qt_abort();
 
 int main() {
-main()
+qt_abort()
 ; return 0; }
 EOF
-if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4554,7 +4501,7 @@
 fi
 
 echo $ac_n "checking for scm_boot_guile in -lguile""... $ac_c" 1>&6
-echo "configure:4558: checking for scm_boot_guile in -lguile" >&5
+echo "configure:4505: checking for scm_boot_guile in -lguile" >&5
 ac_lib_var=`echo guile'_'scm_boot_guile | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4562,7 +4509,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lguile $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4566 "configure"
+#line 4513 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4573,7 +4520,7 @@
 scm_boot_guile()
 ; return 0; }
 EOF
-if { (eval echo configure:4577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4600,12 +4547,12 @@
 for ac_func in strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4604: checking for $ac_func" >&5
+echo "configure:4551: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4609 "configure"
+#line 4556 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4628,7 +4575,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4659,17 +4606,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4663: checking for $ac_hdr" >&5
+echo "configure:4610: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4668 "configure"
+#line 4615 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4800,7 +4747,25 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile libgnome/Makefile libgnomeui/Makefile lib/Makefile lib/pixmaps/Makefile programs/Makefile programs/desktop-properties/Makefile programs/network-utilities/Makefile programs/gmix/Makefile programs/Makefile programs/cromagnon/Makefile intl/Makefile po/Makefile.in guile-gnome/Makefile version.h stamp.h config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "
+Makefile 
+libgnome/Makefile 
+libgnomeui/Makefile 
+lib/Makefile
+lib/desktop-links/Makefile lib/pixmaps/Makefile 
+programs/Makefile
+programs/desktop-properties/Makefile 
+programs/network-utilities/Makefile
+programs/gmix/Makefile 
+programs/cromagnon/Makefile
+programs/panel/Makefile 
+programs/panel/menu/Makefile
+programs/panel/mailcheck/Makefile 
+
+intl/Makefile 
+po/Makefile.in
+guile-gnome/Makefile 
+version.h stamp.h config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4919,7 +4884,24 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile libgnome/Makefile libgnomeui/Makefile lib/Makefile lib/pixmaps/Makefile programs/Makefile programs/desktop-properties/Makefile programs/network-utilities/Makefile programs/gmix/Makefile programs/Makefile programs/cromagnon/Makefile intl/Makefile po/Makefile.in guile-gnome/Makefile version.h stamp.h"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile 
+libgnome/Makefile 
+libgnomeui/Makefile 
+lib/Makefile
+lib/desktop-links/Makefile lib/pixmaps/Makefile 
+programs/Makefile
+programs/desktop-properties/Makefile 
+programs/network-utilities/Makefile
+programs/gmix/Makefile 
+programs/cromagnon/Makefile
+programs/panel/Makefile 
+programs/panel/menu/Makefile
+programs/panel/mailcheck/Makefile 
+
+intl/Makefile 
+po/Makefile.in
+guile-gnome/Makefile 
+version.h stamp.h"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -5240,6 +5222,4 @@
     cd $ac_popdir
   done
 fi
-
-
 
diff -uNr gnome-0.6/configure.in gnome-0.7/configure.in
--- gnome-0.6/configure.in	Mon Sep 29 23:52:25 1997
+++ gnome-0.7/configure.in	Thu Oct  2 23:05:44 1997
@@ -4,7 +4,7 @@
 AC_INIT(gnome.h)
 AM_CONFIG_HEADER(config.h)
 
-VERSION=0.6
+VERSION=0.7
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 
@@ -34,7 +34,7 @@
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
-AC_PROG_INSTALL
+AM_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_STDC_HEADERS
 AC_ARG_PROGRAM
@@ -62,7 +62,7 @@
 
 AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"])
-AC_CHECK_LIB(qt, main)
+AC_CHECK_LIB(qt, qt_abort)
 AC_CHECK_LIB(guile, scm_boot_guile,LIBS="-lguile $LIBS",[
 AC_MSG_ERROR(Can not find Guile 1.2 on the system)
 ], $LIBS)
@@ -85,7 +85,22 @@
 
 AC_CONFIG_SUBDIRS(guile-gtk)
 
-AC_OUTPUT([Makefile libgnome/Makefile libgnomeui/Makefile lib/Makefile lib/pixmaps/Makefile programs/Makefile programs/desktop-properties/Makefile programs/network-utilities/Makefile programs/gmix/Makefile programs/Makefile programs/cromagnon/Makefile intl/Makefile po/Makefile.in guile-gnome/Makefile version.h stamp.h],
-[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
-
-
+AC_OUTPUT([
+Makefile 
+libgnome/Makefile 
+libgnomeui/Makefile 
+lib/Makefile
+lib/desktop-links/Makefile lib/pixmaps/Makefile 
+programs/Makefile
+programs/desktop-properties/Makefile 
+programs/network-utilities/Makefile
+programs/gmix/Makefile 
+programs/cromagnon/Makefile
+programs/panel/Makefile 
+programs/panel/menu/Makefile
+programs/panel/mailcheck/Makefile 
+
+intl/Makefile 
+po/Makefile.in
+guile-gnome/Makefile 
+version.h stamp.h],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff -uNr gnome-0.6/guile-gnome/Makefile.in gnome-0.7/guile-gnome/Makefile.in
--- gnome-0.6/guile-gnome/Makefile.in	Tue Sep 30 00:39:51 1997
+++ gnome-0.7/guile-gnome/Makefile.in	Fri Oct  3 01:04:44 1997
@@ -251,7 +251,8 @@
 	../libgnome/gnome-util.h ../libgnome/gnome-hook.h \
 	../libgnome/gnome-config.h ../libgnome/gnome-dns.h \
 	../libgnomeui/libgnomeui.h ../libgnomeui/gnome-colors.h \
-	../libgnomeui/gnome-color-selector.h
+	../libgnomeui/gnome-color-selector.h \
+	../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-pixmap.h
 
 info:
 dvi:
diff -uNr gnome-0.6/guile-gnome/gnome.scm gnome-0.7/guile-gnome/gnome.scm
--- gnome-0.6/guile-gnome/gnome.scm	Tue Sep 30 00:39:28 1997
+++ gnome-0.7/guile-gnome/gnome.scm	Wed Oct  1 20:37:35 1997
@@ -13,24 +13,23 @@
 	(state 'pack-start))
     (for-each (lambda (thing)
 		(cond
-		 ((eq? thing 'pack-start) (set! state 'pack-start) (display "state start\n"))
-		 ((eq? thing 'pack-end) (set! state 'pack-end) (display "state end\n"))
+		 ((eq? thing 'pack-start) (set! state 'pack-start) )
+		 ((eq? thing 'pack-end) (set! state 'pack-end))
 		 ((and (list? thing) (eq? 'boxed-widget (car thing)))
 		  (case state
 		    ((pack-start) (gtk-box-pack-start box
 						      (cadr thing)
 						      (caddr thing)
 						      (cadddr thing)
-						      (car (cddddr thing)))
-				  (gtk-widget-show (cadr thing))
-				  (display "packing at start\n"))
+						      (car (cddddr 
+thing)))
+				  (gtk-widget-show (cadr thing)))
 		    ((pack-end) (gtk-box-pack-end box
 						  (cadr thing)
 						  (caddr thing)
 						  (cadddr thing)
 						  (car (cddddr thing)))
-				(gtk-widget-show (cadr thing))
-				(display "packing at end\n"))))
+				(gtk-widget-show (cadr thing)))))
 		 (thing (error 'wrong-type-arg thing))))
 	      widgets)
     (gtk-widget-show box)
@@ -49,4 +48,5 @@
   (if (boolean? (car args))
       `(gnome-boxed-widget-internal ,@args)
       `(gnome-boxed-widget-internal #f #f 0 ,@args)))
+
 
diff -uNr gnome-0.6/guile-gtk/Makefile.am gnome-0.7/guile-gtk/Makefile.am
--- gnome-0.6/guile-gtk/Makefile.am	Thu Sep 25 09:26:21 1997
+++ gnome-0.7/guile-gtk/Makefile.am	Fri Oct  3 01:03:38 1997
@@ -26,6 +26,7 @@
 
 %.x: %.c
 	guile-snarf $< >tmp && mv tmp $@
+	ln -s .libs _libs
 
 guile-gtk.x: guile-gtk.c
 gtk-funcs.x: gtk-funcs.c
diff -uNr gnome-0.6/guile-gtk/Makefile.in gnome-0.7/guile-gtk/Makefile.in
--- gnome-0.6/guile-gtk/Makefile.in	Mon Sep 29 21:48:17 1997
+++ gnome-0.7/guile-gtk/Makefile.in	Fri Oct  3 01:04:42 1997
@@ -407,6 +407,7 @@
 
 %.x: %.c
 	guile-snarf $< >tmp && mv tmp $@
+	ln -s .libs _libs
 
 guile-gtk.x: guile-gtk.c
 gtk-funcs.x: gtk-funcs.c
diff -uNr gnome-0.6/guile-gtk/aclocal.m4 gnome-0.7/guile-gtk/aclocal.m4
--- gnome-0.6/guile-gtk/aclocal.m4	Mon Sep 29 21:46:26 1997
+++ gnome-0.7/guile-gtk/aclocal.m4	Fri Oct  3 00:53:30 1997
@@ -152,7 +152,7 @@
 libtool_flags="$libtool_shared$libtool_static"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags"
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
diff -uNr gnome-0.6/guile-gtk/configure gnome-0.7/guile-gtk/configure
--- gnome-0.6/guile-gtk/configure	Mon Sep 29 21:46:31 1997
+++ gnome-0.7/guile-gtk/configure	Fri Oct  3 00:53:33 1997
@@ -1176,7 +1176,7 @@
 libtool_flags="$libtool_shared$libtool_static"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags"
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
diff -uNr gnome-0.6/guile-gtk/gtk-compat.c gnome-0.7/guile-gtk/gtk-compat.c
--- gnome-0.6/guile-gtk/gtk-compat.c	Thu Sep 25 10:07:11 1997
+++ gnome-0.7/guile-gtk/gtk-compat.c	Thu Oct  2 23:13:35 1997
@@ -258,8 +258,8 @@
   idata->orig_func = func;
   idata->orig_data = data;
   idata->orig_notify = notify;
-  return gtk_signal_connect_no_marshal (object, signal,
-					(GtkSignalFunc) remarshal,
+  return gtk_signal_connect_interp (object, signal,
+					(GtkCallbackMarshal) remarshal,
 					idata, renotify, after);
 }
 
diff -uNr gnome-0.6/guile-gtk/ltconfig gnome-0.7/guile-gtk/ltconfig
--- gnome-0.6/guile-gtk/ltconfig	Fri Sep 26 18:40:02 1997
+++ gnome-0.7/guile-gtk/ltconfig	Thu Oct  2 22:42:47 1997
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # ltconfig - Create a system-specific libtool.
+# When updating this script, search for LINENUM and fix line number refs.
 # Generated automatically from ltconfig.in by configure.
 # Copyright (C) 1996, 1997, Free Software Foundation, Inc.
 # Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -32,42 +33,36 @@
 # Constants:
 PROGRAM=ltconfig
 PACKAGE=libtool
-VERSION=1.0c
+VERSION=0.9d
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
 rm="rm -f"
 
 help="Try \`$progname --help' for more information."
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([\\"$]\)/\\\1/g'
-
 # Global variables:
 can_build_shared=yes
 enable_shared=yes
 # All known linkers require a `.a' archive for static linking.
 enable_static=yes
-ltmain=
+ltmain=NONE
 silent=
 srcdir=
 ac_config_guess=
 ac_config_sub=
-host=
-nonopt=
+host=NONE
+nonopt=NONE
 verify_host=yes
 with_gcc=no
-with_gnu_ld=no
 
 old_AR="$AR"
 old_CC="$CC"
 old_CFLAGS="$CFLAGS"
 old_CPPFLAGS="$CPPFLAGS"
 old_LD="$LD"
-old_LN_S="$LN_S"
-old_NM="$NM"
 old_RANLIB="$RANLIB"
 
+test -z "$AR" && AR=ar
+
 # Parse the command line options.
 args=
 prev=
@@ -92,7 +87,6 @@
 Generate a system-specific libtool script.
 
     --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
     --help                 display this help and exit
     --no-verify            do not verify that HOST is a valid host type
     --quiet                same as \`--silent'
@@ -100,7 +94,6 @@
     --srcdir=DIR           find \`config.guess' in DIR
     --version              output version information and exit
     --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
 
 LTMAIN is the \`ltmain.sh' shell script fragment that provides basic libtool
 functionality.
@@ -112,8 +105,6 @@
 
   --disable-shared) enable_shared=no ;;
 
-  --disable-static) enable_static=no ;;
-
   --quiet | --silent) silent=yes ;;
 
   --srcdir) prev=srcdir ;;
@@ -124,7 +115,6 @@
   --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
 
   --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
 
   -*)
     echo "$progname: unrecognized option \`$option'" 1>&2
@@ -133,9 +123,9 @@
     ;;
 
   *)
-    if test -z "$ltmain"; then
+    if test "$ltmain" = NONE; then
       ltmain="$option"
-    elif test -z "$host"; then
+    elif test "$host" = NONE; then
 # FIXME This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
 #      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
 #        echo "$progname: warning \`$option' is not a valid host type" 1>&2
@@ -149,7 +139,7 @@
   esac
 done
 
-if test -z "$ltmain"; then
+if test "$ltmain" = NONE; then
   echo "$progname: you must specify a LTMAIN file" 1>&2
   echo "$help" 1>&2
   exit 1
@@ -213,7 +203,6 @@
   test "$srcdir" = "$ltmain" && srcdir=.
 fi
 
-trap "$rm conftest*; exit 1" 1 2 15
 if test "$verify_host" = yes; then
   # Check for config.guess and config.sub.
   ac_aux_dir=
@@ -243,7 +232,7 @@
 
   host_alias=$host
   case "$host_alias" in
-  "")
+  NONE)
     if host_alias=`$ac_config_guess`; then :
     else
       echo "$progname: cannot guess host type; you must specify one" 1>&2
@@ -254,7 +243,13 @@
   host=`$ac_config_sub $host_alias`
   echo "$ac_t""$host" 1>&6
 
-elif test -z "$host"; then
+  # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
+  case "$host" in
+  *-*-linux-gnu*) ;;
+  *-*-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+  esac
+
+elif test "$host" = NONE; then
   echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
   echo "$help" 1>&2
   exit 1
@@ -268,32 +263,31 @@
 *-*-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 esac
 
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
 
 # Determine commands to create old-style static archives.
 old_archive_cmds='$AR cru $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 
-# Set a sane default for `AR'.
-test -z "$AR" && AR=ar
-
 # If RANLIB is not set, then run the test.
 if test "${RANLIB+set}" != "set"; then
   result=no
 
   echo $ac_n "checking for ranlib... $ac_c" 1>&6
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/ranlib; then
-      RANLIB="ranlib"
-      result="ranlib"
-      break
-    fi
-  done
-  IFS="$save_ifs"
+  if test "$result" = no; then
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    for dir in $PATH; do
+      test -z "$dir" && dir=.
+      if test -f $dir/ranlib; then
+	RANLIB="ranlib"
+	result="ranlib"
+	break
+      fi
+    done
+    IFS="$save_ifs"
+  fi
 
   echo $ac_t "$result" 1>&6
 fi
@@ -304,7 +298,7 @@
 fi
 
 # Check to see if we are using GCC.
-if test "$with_gcc" != yes || test -z "$CC"; then
+if test "$with_gcc" = no; then
   # If CC is not set, then try to find GCC or a usable CC.
   if test -z "$CC"; then
     echo $ac_n "checking for gcc... $ac_c" 1>&6
@@ -373,15 +367,16 @@
   # Now see if the compiler is really GCC.
   with_gcc=no
   echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-  echo "$progname:376: checking whether we are using GNU C" >&5
 
+  trap "$rm conftest.c; exit 1" 1 2 15
   $rm conftest.c
   cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  # LINENUM
+  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     with_gcc=yes
   fi
   $rm conftest.c
@@ -398,63 +393,53 @@
 special_shlib_compile_flags=
 wl=
 link_static_flag=
-no_builtin_flag=
 
 if test "$with_gcc" = yes; then
+  pic_flag='-fPIC'
   profile_flag_pattern='-pg?'
   wl='-Wl,'
   link_static_flag='-static'
-  no_builtin_flag=' -fno-builtin'
-
-  case "$host_os" in
-  irix5* | irix6*)
-    # PIC is the default for these OSes.
-    pic_flag=
-    ;;
-  *)
-    pic_flag='-fPIC'
-    ;;
-  esac
 else
   # PORTME Check for PIC flags for the system compiler.
-  case "$host_os" in
-  aix3* | aix4*)
+  case "$host" in
+  *-*-aix3* | *-*-aix4*)
     # FIXME All rs/6000 code is PIC, but is there any non-rs/6000 AIX platform?
+    pic_flag=
     link_static_flag='-bnso -bI:/lib/syscalls.exp'
     ;;
 
-  hpux9* | hpux10*)
+  *-*-hpux9* | *-*-hpux10*)
     # FIXME is there a better link_static_flag that works with the bundled CC?
     wl='-Wl,'
     link_static_flag='${wl}-a ${wl}archive'
+    pic_flag='+Z'
     ;;
 
-  irix5* | irix6*)
+  *-*-irix5* | *-*-irix6*)
     wl='-Wl,'
     link_static_flag='-non_shared'
     # PIC (with -KPIC) is the default.
     pic_flag=
     ;;
 
-  osf3* | osf4*)
+  *-*-osf3* | *-*-osf4*)
     # FIXME - pic_flag is probably required for hppa*-osf* and i860-osf*
     wl='-Wl,'
     link_static_flag='-non_shared'
     ;;
 
-  sco3.2v5*)
+  *-*-sco3.2v5*)
     pic_flag='-Kpic'
     link_static_flag='-dn'
     special_shlib_compile_flags='-belf'
     ;;
 
-  solaris2*)
+  *-*-solaris2*)
     pic_flag='-KPIC'
     link_static_flag='-Bstatic'
-    wl='-Wl,'
     ;;
 
-  sunos4*)
+  *-*-sunos4*)
     pic_flag='-PIC'
     link_static_flag='-Bstatic'
     wl='-Qoption ld '
@@ -466,47 +451,16 @@
   esac
 fi
 
-case "$host_cpu" in
-alpha | rs6000 | powerpc | powerpcle)
+case "$host" in
+rs6000-*-* | powerpc-*-* | powerpcle-*-*)
   # Yippee! All RS/6000 and PowerPC code is position-independent.
-  # Apparently, so is DEC alpha!
   pic_flag=
   ;;
 esac
 
 if test -n "$pic_flag"; then
   echo $ac_t "$pic_flag" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-  $rm conftest*
-  echo > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $pic_flag -DPIC"
-  echo "$progname:486: checking if $compiler PIC flag $pic_flag works" >&5
-  if { (eval echo $progname:487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-
-    # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
-    # reports no error.  So, we need to grep stderr for (Bundled).
-    if grep '(Bundled)' conftest.err >/dev/null; then
-      echo $ac_t no 1>&6
-      can_build_shared=no
-      pic_flag=
-    else
-      echo $ac_t yes 1>&6
-      pic_flag=" $pic_flag"
-    fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    can_build_shared=no
-    pic_flag=
-    echo $ac_t no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
+  pic_flag=" $pic_flag"
 else
   echo $ac_t none 1>&6
 fi
@@ -521,125 +475,43 @@
   fi
 fi
 
-echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-$rm conftest*
-echo 'main(){return(0);}' > conftest.c
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:529: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+echo $ac_n "checking for $compiler option to statically link programs... $ac_c" 1>&6
+if test -n "$link_static_flag"; then
   echo $ac_t "$link_static_flag" 1>&6
 else
   echo $ac_t none 1>&6
-  link_static_flag=
 fi
-LDFLAGS="$save_LDFLAGS"
-$rm conftest*
 
-if test -z "$LN_S"; then
-  # Check to see if we can use ln -s, or we need hard links.
-  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-  $rm conftestdata
-  if ln -s X conftestdata 2>/dev/null; then
-    $rm conftestdata
-    LN_S="ln -s"
-  else
-    LN_S=ln
-  fi
-  if test "$LN_S" = "ln -s"; then
-    echo "$ac_t"yes 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-fi
-
-# Make sure LD is an absolute path.
-case "$LD" in
-/*) ;;
-*)
-  ac_prog=ld
-  if test "$with_gcc" = yes; then
-    # Check if gcc -print-prog-name=ld gives a path.
-    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-    echo "$progname:564: checking for ld used by GCC" >&5
-    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-    case "$ac_prog" in
-    # Accept absolute paths.
-    /*) ;;
-    "")
-      # If it fails, then pretend we aren't using GCC.
-      ac_prog=ld
-      ;;
-    *)
-      # If it is relative, then search for the first ld in PATH.
-      with_gnu_ld=unknown
-      ;;
-    esac
-  elif test "$with_gnu_ld" = yes; then
-    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-    echo "$progname:580: checking for GNU ld" >&5
-  else
-    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-    echo "$progname:583: checking for non-GNU ld" >&5
-  fi
-  LD=${LD-$ac_prog}
-  case "$LD" in
-  /*)
-    ac_cv_path_LD="$LD" # Let the user override the test with a path.
-    ;;
-  *)
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in $PATH; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f "$ac_dir/$ac_prog"; then
-	LD="$ac_dir/$ac_prog"
-	# Check to see if the program is GNU ld.  I'd rather use --version,
-	# but apparently some GNU ld's only accept -v.
-	# Break only if it was the GNU/non-GNU ld that we prefer.
-	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	  test "$with_gnu_ld" != no && break
-	else
-	  test "$with_gnu_ld" != yes && break
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-    ;;
-  esac
-  echo $ac_t "$with_gnu_ld" 1>&6
-  ;;
-esac
-
-# Check to see if it really is or isn't GNU ld.
-echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+# See if we're really using GNU ld.
+test -z "$LD" && LD="ld"
+with_gnu_ld=no
+# Allow LD to be a program name with arguments.
+set dummy $LD
+linker="$2"
+echo $ac_n "checking if $LD is GNU ld... $ac_c" 1>&6
+if $LD --version 2>&1 | egrep '(GNU ld|with BFD)' > /dev/null; then
   with_gnu_ld=yes
-else
-  with_gnu_ld=no
+  linker="GNU ld"
 fi
 echo $ac_t "$with_gnu_ld" 1>&6
 
 # See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
+echo $ac_n "checking if $linker supports shared libraries... $ac_c" 1>&6
 
-allow_undefined_flag=
 archive_cmds=
-export_dynamic_flag_spec=
+export_dynamic_flag=
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
 hardcode_direct=no
 hardcode_minus_L=no
-hardcode_runpath_var=no
 hardcode_shlibpath_var=unsupported
-runpath_var=
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
   # See if GNU ld supports shared libraries.
 
-  case "$host_os" in
-  sunos4*)
+  case "$host" in
+  *-*-sunos4*)
     ld_shlibs=yes
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -647,8 +519,6 @@
 
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
       ld_shlibs=yes
     else
       ld_shlibs=no
@@ -657,81 +527,52 @@
   esac
 
   if test "$ld_shlibs" = yes; then
-    archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
+    archive_cmds='$cc -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
     hardcode_libdir_flag_spec='${wl}-rpath $wl$libdir'
-    export_dynamic_flag_spec='${wl}-export-dynamic'
+    export_dynamic_flag='${wl}-export-dynamic'
   fi
 else
   # PORTME fill in a description of your system's linker (not GNU ld)
-  case "$host_os" in
-  aix3*)
-    allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '"'s/.* //'"' > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE -lc$deplibs;$AR cru $lib $objdir/$soname'
+  case "$host" in
+  *-*-aix3*)
+    archive_cmds='/usr/ucb/nm$libobjs | egrep \" [BD] \" | sed \"s/^.* //\" > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE -lc$deplibs;$AR cru $lib $objdir/$soname'
     # Note: this linker hardcodes the directories in LIBPATH if there
     # are no directories specified by -L.
     hardcode_minus_L=yes
-    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
-    fi
     ;;
 
-  aix4*)
-    allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '"'s/.* //'"' > $lib.exp;$CC -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry$deplibs;$AR cru $lib $objdir/$soname'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    ;;
-
-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-  # support.  Future versions do this automatically, but an explicit c++rt0.o
-  # doesn't break anything, and helps significantly (at the cost of a little
-  # extra space).
-  freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
-    hardcode_direct=yes
+  *-*-aix4*)
+    archive_cmds='/bin/nm -B$libobjs | egrep \" [BD] \" | sed \"s/^.* //\" > $lib.exp;$cc -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry$deplibs;$AR cru $lib $objdir/$soname'
     hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
     ;;
 
-  # Unfortunately, older versions of FreeBSD 2 don't have this feature.
-  freebsd2*)
+  *-*-freebsd*)
     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
     hardcode_direct=yes
     hardcode_minus_L=yes
     hardcode_shlibpath_var=no
     ;;
 
-  # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-  freebsd3*)
-    archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  hpux9*)
+  *-*-hpux9*)
     archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs$deplibs;mv $objdir/$soname $lib'
     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
     hardcode_direct=yes
     hardcode_minus_L=yes
     ;;
 
-  hpux10*)
+  *-*-hpux10*)
     archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs$deplibs'
     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
     hardcode_direct=yes
     hardcode_minus_L=yes
     ;;
 
-  irix5* | irix6*)
+  *-*-irix5* | *-*-irix6*)
     archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     ;;
 
-  netbsd* | openbsd*)
+  *-*-netbsd*)
     # Tested with NetBSD 1.2 ld
     archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
     hardcode_libdir_flag_spec='-R$libdir'
@@ -739,25 +580,24 @@
     hardcode_shlibpath_var=no
     ;;
 
-  osf3* | osf4*)
-    allow_undefined_flag=' -expect_unresolved'
-    archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
+  *-*-osf3* | *-*-osf4*)
+    archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
     ;;
 
-  sco3.2v5*)
+  *-*-sco3.2v5*)
     archive_cmds='$LD -G -o $lib$libobjs$deplibs'
     hardcode_direct=yes
     ;;
 
-  solaris2*)
+  *-*-solaris2*)
     archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no
     ;;
 
-  sunos4*)
+  *-*-sunos4*)
     archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_direct=yes
@@ -773,179 +613,29 @@
 fi
 echo $ac_t "$ld_shlibs" 1>&6
 
-if test -z "$NM"; then
-  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-  case "$NM" in
-  /*) ;; # Let the user override the test with a path.
-  *)
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in /usr/ucb:$PATH:/bin; do
-      test -z "$ac_dir" && dir=.
-      if test -f $ac_dir/nm; then
-        # Check to see if the nm accepts a BSD-compat flag.
-        if ($ac_dir/nm -B /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
-          NM="$ac_dir/nm -B"
-        elif ($ac_dir/nm -p /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
-          NM="$ac_dir/nm -p"
-	else
-          NM="$ac_dir/nm"
-	fi
-        break
-      fi
-    done
-    IFS="$ac_save_ifs"
-    test -z "$NM" && NM=nm
-    ;;
-  esac
-  echo "$ac_t$NM" 1>&6
-fi
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRSTU]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \1'
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  symcode='[BCDTU]'
-  ;;
-solaris2*)
-  symcode='[BDTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTU]'
-fi
-
-# Delete symbols that are not valid C identifiers.
-global_symbol_pipe="sed -e '/^.* $symcode $sympat$/!d'"
-
-# Write the raw and C identifiers.
-global_symbol_pipe="$global_symbol_pipe -e 's/^.* $symcode $sympat$/$symxfrm/'"
-
-# Check to see that the pipe works correctly.
-pipe_works=no
-$rm conftest*
-cat > conftest.c <<EOF
-char nm_test_var;
-void nm_test_func(){}
-main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-echo "$progname:848: checking if global_symbol_pipe works" >&5
-if { (eval echo $progname:849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
-  # Now try to grab the symbols.
-  nlist=conftest.nm
-  if { echo "$progname:852: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-    # Try sorting and uniquifying the output.
-    if sort "$nlist" | uniq > "$nlist"T; then
-      mv -f "$nlist"T "$nlist"
-      wcout=`wc "$nlist" 2>/dev/null`
-      count=`echo "$wcout" | sed 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-      test "$wcout" = "$count" && count=-1
-    else
-      rm -f "$nlist"T
-      count=-1
-    fi
-
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" > conftest.c
-
-	cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define __ptr_t void *
-#else
-# define __ptr_t char *
-#endif
-
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $count;
-
-/* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
-}
-dld_preloaded_symbols[] =
-{
-EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", \&\2},/' < "$nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
-  {0},
-};
-EOF
-        # Now try linking the two files.
-        mv conftest.o conftestm.o
-	save_LIBS="$LIBS"
-	save_CFLAGS="$CFLAGS"
-        LIBS='conftestm.o'
-	CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo $progname:900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-          pipe_works=yes
-        else
-          echo "$progname: failed program was:" >&5
-          cat conftest.c >&5
-        fi
-        LIBS="$save_LIBS"
-      fi
-    else
-      echo "cannot find nm_test_func in $nlist" >&5
-    fi
-  else
-    echo "cannot find nm_test_var in $nlist" >&5
-  fi
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-$rm conftest*
-
-# Don't use the global_symbol_pipe unless it works.
-echo "$ac_t$pipe_works" 1>&6
-test "$pipe_works" = yes || global_symbol_pipe=
-
 # Check hardcoding attributes.
 echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
 hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test "$hardcode_runpath_var" = yes; then
-
+if test -n "$hardcode_libdir_flag_spec"; then
   # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no && \
-     test "$hardcode_minus_L" != no && \
+  if test "$hardcode_direct" != no &&
+     test "$hardcode_minus_L" != no &&
      test "$hardcode_shlibpath_var" != no; then
 
-    # Linking always hardcodes the temporary library directory.
+    # Can't link without hardcoding.
     hardcode_action=relink
   else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
     hardcode_action=immediate
   fi
-elif test "$hardcode_direct" != yes && \
-     test "$hardcode_minus_L" != yes && \
-     test "$hardcode_shlibpath_var" != yes; then
+elif test "$hardcode_direct" = yes ||
+     test "$hardcode_minus_L" = yes ||
+     test "$hardcode_shlibpath_var" = yes; then
+
+  # We can't hardcode non-existant directories, but we can existing ones.
+  hardcode_action=immediate
+else
   # We can't hardcode anything.
   hardcode_action=unsupported
-else
-  # We can only hardcode existing directories.
-  hardcode_action=relink
 fi
 echo $ac_t "$hardcode_action" 1>&6
 test "$hardcode_action" = unsupported && can_build_shared=no
@@ -953,7 +643,7 @@
 
 reload_flag=
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
-echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
+echo $ac_n "checking for $linker option to reload object files... $ac_c" 1>&6
 # PORTME Some linker may need a different reload flag.
 reload_flag='-r'
 echo $ac_t "$reload_flag"
@@ -969,8 +659,8 @@
 dynamic_linker="$host_os ld.so"
 
 echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case "$host_os" in
-aix3* | aix4*)
+case "$host" in
+*-*-aix3* | *-*-aix4*)
   version_type=linux
   library_names_spec='$libname.so.$versuffix $libname.a'
   shlibpath_var=LIBPATH
@@ -979,20 +669,16 @@
   soname_spec='$libname.so.$major'
   ;;
 
-freebsd2* | freebsd3*)
+*-*-freebsd*)
   version_type=sunos
   library_names_spec='$libname.so.$versuffix $libname.so'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds='ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-gnu*)
-  version_type=sunos
-  library_names_spec='$libname.so.$versuffix'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
+# *-*-gnu* needs to come after *-*-linux-gnu*.
 
-hpux9* | hpux10*)
+*-*-hpux9* | *-*-hpux10*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   dynamic_linker="$host_os dld.sl"
@@ -1004,7 +690,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-irix5* | irix6*)
+*-*-irix5* | *-*-irix6*)
   version_type=osf
   soname_spec='$libname.so'
   library_names_spec='$libname.so.$versuffix $libname.so'
@@ -1012,70 +698,68 @@
   ;;
 
 # No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+*-*-linux-gnuoldld* | *-*-linux-gnuaout* | *-*-linux-gnucoff*)
   dynamic_linker=no
+  can_build_shared=no
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+*-*-linux-gnu*)
   version_type=linux
   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
   soname_spec='$libname.so.$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  finish_cmds='ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-  if test -f /lib/ld.so.1; then
-    dynamic_linker='GNU ld.so'
-  else
-    # Only the GNU ld.so supports shared libraries on MkLinux.
-    case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
-    *) dynamic_linker='Linux ld.so' ;;
-    esac
-  fi
+*-*-gnu*)
+  version_type=sunos
+  library_names_spec='$libname.so.$versuffix'
+  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-netbsd* | openbsd*)
+*-*-netbsd*)
   version_type=sunos
   library_names_spec='$libname.so.$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds='ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-osf3* | osf4*)
+*-*-osf3* | *-*-osf4*)
   version_type=osf
   soname_spec='$libname.so'
   library_names_spec='$libname.so.$versuffix $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-sco3.2v5*)
+*-*-sco3.2v5*)
   version_type=osf
   soname_spec='$libname.so.$major'
   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-solaris2*)
+*-*-solaris2*)
   version_type=linux
   library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
   soname_spec='$libname.so.$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-sunos4*)
+*-*-sunos4*)
   version_type=sunos
   library_names_spec='$libname.so.$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  finish_cmds='ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 *)
   dynamic_linker=no
+  can_build_shared=no
   ;;
 esac
 echo "$ac_t""$dynamic_linker"
-test "$dynamic_linker" = no && can_build_shared=no
+
 
 # FIXME need to add library stripping features
 # strip -x works for most platforms, though not for static libraries on NetBSD
@@ -1122,24 +806,10 @@
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
 
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-# Now quote all the things that may contain metacharacters.
-for var in old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
-  old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \
-  link_static_flag no_builtin_flag export_dynamic_flag_spec \
-  profile_flag_pattern library_names_spec soname_spec RANLIB \
-  old_archive_cmds old_postinstall_cmds archive_cmds postinstall_cmds \
-  allow_undefined_flag finish_cmds global_symbol_pipe striplib old_striplib \
-  hardcode_libdir_flag_spec hardcode_libdir_separator; do
-
-  eval "$var=\`echo \"\$$var\" | sed \"\$sed_quote_subst\"\`"
-done
-
 ofile=libtool
 trap "$rm $ofile; exit 1" 1 2 15
 echo creating $ofile
-$rm $ofile
+rm -fr $ofile
 cat <<EOF > $ofile
 #! /bin/sh
 
@@ -1149,8 +819,7 @@
 # This program was configured as follows,
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
-# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
+# CC="$old_CC" CFLAGS="$old_CFLAGS" LD="$old_LD" RANLIB="$old_RANLIB" \\
 #   $0$ltconfig_args
 #
 # Compiler and other test output produced by $progname, useful for
@@ -1170,76 +839,55 @@
 host="$host"
 
 # The archiver.
-AR="$AR"
-
-# The default C compiler.
-CC="$CC"
+AR='$AR'
 
 # The linker used to build libraries.
-LD="$LD"
-
-# Whether we need hard or soft links.
-LN_S="$LN_S"
-
-# A BSD-compatible nm program.
-NM="$NM"
+LD='$LD'
 
 # How to create reloadable object files.
-reload_flag="$reload_flag"
-reload_cmds="$reload_cmds"
+reload_flag='$reload_flag'
+reload_cmds='$reload_cmds'
 
 # How to pass a linker flag through the compiler.
-wl="$wl"
+wl='$wl'
 
 # Additional compiler flags for building library objects.
-pic_flag="$pic_flag"
+pic_flag='$pic_flag'
 
 # Compiler flag to prevent dynamic linking.
-link_static_flag="$link_static_flag"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag="$no_builtin_flag"
+link_static_flag='$link_static_flag'
 
 # Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="$export_dynamic_flag_spec"
+export_dynamic_flag='$export_dynamic_flag'
 
 # Pattern to match compiler flags for creating libNAME_p libraries:
-profile_flag_pattern="$profile_flag_pattern"
+profile_flag_pattern='$profile_flag_pattern'
 
 # Library versioning type.
 version_type=$version_type
 
 # List of archive names.  First name is the real one, the rest are links.
 # The last name is the one that the linker finds with -lNAME.
-library_names_spec="$library_names_spec"
+library_names_spec='$library_names_spec'
 
 # The coded name of the library, if different from the real name.
-soname_spec="$soname_spec"
+soname_spec='$soname_spec'
 
 # Commands used to build and install an old-style archive.
-RANLIB="$RANLIB"
-old_archive_cmds="$old_archive_cmds"
-old_postinstall_cmds="$old_postinstall_cmds"
+RANLIB='$RANLIB'
+old_archive_cmds='$old_archive_cmds'
+old_postinstall_cmds='$old_postinstall_cmds'
 
 # Commands used to build and install a shared archive.
-archive_cmds="$archive_cmds"
-postinstall_cmds="$postinstall_cmds"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag="$allow_undefined_flag"
+archive_cmds='$archive_cmds'
+postinstall_cmds='$postinstall_cmds'
 
 # Commands used to finish a libtool library installation in a directory.
-finish_cmds="$finish_cmds"
-
-# Take the output of nm and produce a listing of raw symbols and C names
-global_symbol_pipe="$global_symbol_pipe"
+finish_cmds='$finish_cmds'
 
 # How to strip a library file.
-striplib="$striplib"
-old_striplib="$old_striplib"
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+striplib='$striplib'
+old_striplib='$old_striplib'
 
 # This is the shared library path variable.
 shlibpath_var=$shlibpath_var
@@ -1249,10 +897,10 @@
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$hardcode_libdir_flag_spec"
+hardcode_libdir_flag_spec='$hardcode_libdir_flag_spec'
 
 # Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
+hardcode_libdir_separator='$hardcode_libdir_separator'
 
 # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
 # resulting binary.
@@ -1262,11 +910,7 @@
 # resulting binary.
 hardcode_minus_L=$hardcode_minus_L
 
-# Set to yes if using RUNPATH_VAR=DIR during linking hardcodes DIR into the
-# resulting binary.
-hardcode_runpath_var=$hardcode_runpath_var
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into the
 # the resulting binary.
 hardcode_shlibpath_var=$hardcode_shlibpath_var
 
diff -uNr gnome-0.6/guile-gtk/ltmain.sh gnome-0.7/guile-gtk/ltmain.sh
--- gnome-0.6/guile-gtk/ltmain.sh	Fri Sep 26 18:40:02 1997
+++ gnome-0.7/guile-gtk/ltmain.sh	Thu Oct  2 22:42:50 1997
@@ -1,5 +1,5 @@
 # ltmain.sh - Provide generalized library-building support services.
-# Generated automatically from ltmain.in by configure.
+# Generated automatically from ltmain.sh.in by configure.
 # Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 # Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -22,70 +22,34 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-#FIXME: echo=echo
-echo='printf %s\n'
-if test "X`$echo '\t'`" = 'X\t'; then :
-else
-  # The Solaris and AIX default echo program unquotes backslashes.
-  # This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  # So, we emulate echo with printf '%s\n'
-  echo='printf %s\n'
-  if test "X`$echo '\t'`" = 'X\t'; then :
-  else
-    # Oops.  We have no working printf.  Try to find a not-so-buggy echo.
-    echo=echo
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-    save_PATH="$PATH"
-    PATH="$PATH":/usr/ucb
-    for dir in $PATH; do
-      if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then
-        echo="$dir/echo"
-        break
-      fi
-    done
-    IFS="$save_ifs"
-    PATH="$save_PATH"
-  fi
-fi
-
 # The name of this program.
-progname=`$echo "$0" | sed 's%^.*/%%'`
+progname=`echo "$0" | sed 's%^.*/%%'`
 
 # Constants.
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.0c
+VERSION=0.9d
 
-default_mode=
+default_mode=NONE
 help="Try \`$progname --help' for more information."
+ln_s="ln -s"
+cp_p="cp -p"
 magic="%%%MAGIC variable%%%"
 mkdir="mkdir"
 mv="mv -f"
-objdir=_libs
+objdir=.libs
 rm="rm -f"
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([\\"$]\)/\\\1/g'
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-
 if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  $echo "$progname: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  echo "$progname: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
   exit 1
 fi
 
 #
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$progname: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  echo "$progname: not configured to build any kind of library" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
   exit 1
 fi
 
@@ -95,32 +59,23 @@
 prev=
 prevopt=
 run=
-show="$echo"
+show=echo
 show_help=
-execute_dlfiles=
 
 # Parse our command line options once, thoroughly.
-while test $# -gt 0
+while test -n "$1"
 do
   arg="$1"
   shift
 
   case "$arg" in
-  -*=*) optarg=`$echo "$arg" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  -*=*) optarg=`echo "$arg" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
   *) optarg= ;;
   esac
 
   # If the previous option needs an argument, assign it.
   if test -n "$prev"; then
-    case "$prev" in
-    execute_dlfiles)
-      eval "$prev=\"\$$prev \$arg\""
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
+    eval "$prev=\$arg"
     prev=
     prevopt=
     continue
@@ -133,7 +88,7 @@
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION"
+    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
     exit 0
     ;;
 
@@ -142,16 +97,16 @@
     ;;
 
   --features)
-    $echo "host: $host"
+    echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
+      echo "enable shared libraries"
     else
-      $echo "disable shared libraries"
+      echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
+      echo "enable static libraries"
     else
-      $echo "disable static libraries"
+      echo "disable static libraries"
     fi
     exit 0
     ;;
@@ -161,18 +116,9 @@
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
-  --quiet | --silent)
-    show=:
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
   -*)
-    $echo "$progname: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
+    echo "$progname: unrecognized option \`$arg'" 1>&2
+    echo "$help" 1>&2
     exit 1
     ;;
 
@@ -183,31 +129,25 @@
   esac
 done
 
+
 if test -n "$prevopt"; then
-  $echo "$progname: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
+  echo "$progname: option \`$prevopt' requires an argument" 1>&2
+  echo "$help" 1>&2
   exit 1
 fi
 
+
 if test -z "$show_help"; then
 
   # Infer the operation mode.
-  if test -z "$mode"; then
+  if test "$mode" = NONE; then
     case "$nonopt" in
     *cc)
-      mode=link
-      for arg
-      do
-        case "$arg" in
-        -c)
-           mode=compile
-           break
-           ;;
-        esac
-      done
-      ;;
-    *db | *dbx)
-      mode=execute
+      if echo " $@ " | egrep "[ 	]-c[ 	]" > /dev/null 2>&1; then
+        mode=compile
+      else
+        mode=link
+      fi
       ;;
     *install*|cp)
       mode=install
@@ -215,29 +155,22 @@
     *rm)
       mode=uninstall
       ;;
+    *.la)
+      mode=dlname
+      ;;
     *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
       # Just use the default operation mode.
-      if test -z "$mode"; then
-        if test -n "$nonopt"; then
-          $echo "$progname: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-        else
-          $echo "$progname: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-        fi
+      if test "$mode" = NONE; then
+	if test -n "$nonopt"; then
+	  echo "$progname: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  echo "$progname: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
       fi
       ;;
     esac
   fi
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$progname: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
   # Change the help message to a mode-specific one.
   generic_help="$help"
   help="Try \`$progname --help --mode=$mode' for more information."
@@ -248,128 +181,93 @@
   compile)
     progname="$progname: compile"
     # Get the compilation command and the source file.
-    base_compile=
+    base_compile="$nonopt"
     lastarg=
-    srcfile="$nonopt"
-    suppress_output=
+    srcfile=
 
     for arg
     do
-      # The only flag that cannot be specified is the output filename.
-      if test "X$arg" = "X-o"; then
-	$echo "$progname: you cannot specify the output filename with \`-o'" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
-
-      # Aesthetically quote the previous argument.
-
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
-      lastarg=`$echo "$lastarg" | sed "$sed_quote_subst"`
-
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly in scan
-      # sets, so we specify it separately.
-      case "$lastarg" in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	lastarg="\"$lastarg\""
-	;;
+      # Quote any args containing shell metacharacters.
+      case "$arg" in
+      *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*|*\"*)
+	 quote_arg="'$arg'" ;;
+      *) quote_arg="$arg" ;;
       esac
 
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-	base_compile="$lastarg"
-      else
-	base_compile="$base_compile $lastarg"
-      fi
+      base_compile="$base_compile$lastarg"
+      srcfile="$quote_arg"
+      lastarg=" $srcfile"
     done
 
     # Get the name of the library object.
-    libobj=`$echo "$srcfile" | sed -e 's%^.*/%%'`
+    libobj=`echo "$srcfile" | sed -e 's%^.*/%%'`
 
     # Recognize several different file suffixes.
-    xform='[cCFSfm]'
+    xform='[cCFSf]'
     case "$libobj" in
-    *.c++) xform=c++ ;;
+    *.c++) xform='c++' ;;
     *.cc) xform=cc ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
     *.f90) xform=f90 ;;
-    *.for) xform=for ;;
+    *.for) xform='for' ;;
     esac
 
-    libobj=`$echo "$libobj" | sed -e "s/\.$xform$/.lo/"`
+    libobj=`echo "$libobj" | sed -e "s/\.$xform$/.lo/"`
 
     case "$libobj" in
-    *.lo) obj=`$echo "$libobj" | sed -e 's/\.lo$/.o/'` ;;
+    *.lo) obj=`echo "$libobj" | sed -e 's/\.lo$/.o/'` ;;
     *)
-      $echo "$progname: cannot determine name of library object from \`$srcfile'" 1>&2
+      echo "$progname: cannot determine name of library object from \`$srcfile'" 1>&2
       exit 1
       ;;
     esac
 
     if test -z "$base_compile"; then
-      $echo "$progname: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
+      echo "$progname: you must specify a compilation command" 1>&2
+      echo "$help" 1>&2
       exit 1
     fi
 
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      $run $rm $obj $libobj
-      trap "$run $rm $obj $libobj; exit 1" 1 2 15
-    else
-      $run $rm $libobj
-      trap "$run $rm $libobj; exit 1" 1 2 15
-    fi
+    # Delete any old library objects.
+    $run $rm $obj $libobj
+    trap "$run $rm $obj $libobj; exit 1" 1 2 15
 
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
       # All platforms use -DPIC, to notify preprocessed assembler code.
       $show "$base_compile$pic_flag -DPIC $srcfile"
-      if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then :
+      if eval "$run $base_compile$pic_flag -DPIC $srcfile"; then :
       else
-        test -n "$obj" && $run $rm $obj
-        exit 1
+	$run $rm $obj
+	exit 1
       fi
 
       # If we have no pic_flag, then copy the object into place and finish.
       if test -z "$pic_flag"; then
-        $show "$LN_S $obj $libobj"
-        $run $LN_S $obj $libobj
-        exit $?
+	$show "$ln_s $obj $libobj"
+	$run $ln_s $obj $libobj || $run $cp_p $obj $libobj
+	exit $?
       fi
 
       # Just move the object, then go on to compile the next one
       $show "$mv $obj $libobj"
       $run $mv $obj $libobj || exit 1
-
-      # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
     fi
 
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      # Suppress compiler output if we already did a PIC compilation.
-      $show "$base_compile $srcfile$suppress_output"
-      if $run eval "$base_compile \$srcfile$suppress_output"; then :
-      else
-        $run $rm $obj $libobj
-        exit 1
-      fi
+    # Compile the position-dependent object.
+    $show "$base_compile $srcfile"
+    if eval "$run $base_compile $srcfile"; then :
+    else
+      $run $rm $obj $libobj
+      exit 1
     fi
 
-    # Create an invalid libtool object if no PIC, so that we don't accidentally
-    # link it into a program.
+    # Symlink or copy the object file into library object, if no PIC.
     if test "$build_libtool_libs" != yes; then
-      $show "$echo timestamp > $libobj"
-      $run eval "\$echo timestamp > \$libobj" || exit $?
+      $show "$ln_s $obj $libobj"
+      $run $ln_s $obj $libobj || $run $cp_p $obj $libobj
+      exit $?
     fi
 
     exit 0
@@ -378,406 +276,348 @@
   # libtool link mode
   link)
     progname="$progname: link"
-    CC="$nonopt"
-    allow_undefined=no
-    compile_command="$CC"
-    finalize_command="$CC"
-
+    # Go through the arguments, transforming them on the way.
+    cc="$nonopt"
+    args="$cc"
+    compile_command="$cc"
+    finalize_command="$cc"
     compile_shlibpath=
     finalize_shlibpath=
     deplibs=
-    dlfiles=
-    dlprefiles=
     export_dynamic=no
     hardcode_libdirs=
+    install_libdir=
     libobjs=
     link_against_libtool_libs=
+    link_static=
     ltlibs=
     objs=
+    output=
     prev=
     prevarg=
-    rpath=
-    perm_rpath=
     temp_rpath=
     vinfo=
+    whole_archive=no
 
     # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case "$arg" in
-      -all-static | -static)
-        if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$progname: warning: complete static linking is impossible in this configuration" 1>&2
-        fi
-        build_libtool_libs=no
-	build_old_libs=yes
-        break
-        ;;
-      esac
-    done
+    case " $@ " in
+    *" -static "*) build_libtool_libs=no build_old_libs=yes ;;
+    esac
 
-    # Go through the arguments, transforming them on the way.
     for arg
     do
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
-        case "$prev" in
-        output)
-          compile_command="$compile_command @OUTPUT@"
-          finalize_command="$finalize_command @OUTPUT@"
-          ;;
-        esac
-
-        case "$prev" in
-        dlfiles|dlprefiles)
-          case "$arg" in
-          *.la | *.lo) ;;  # We handle these cases below.
-          *)
-            dlprefiles="$dlprefiles $arg"
-            test "$prev" = dlfiles && dlfiles="$dlfiles $arg"
-            prev=
-            ;;
-          esac
-          ;;
-        rpath)
-	  rpath="$rpath $arg"
-	  prev=
-	  continue
+	case "$prev" in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  args="$args $arg"
 	  ;;
-        *)
-          eval "$prev=\"\$arg\""
-          prev=
-          continue
-          ;;
-        esac
+	esac
+
+	eval "$prev=\$arg"
+	prev=
+
+	continue
       fi
 
+      args="$args $arg"
       prevarg="$arg"
 
       case "$arg" in
-      -all-static)
-	if test -n "$link_static_flag"; then
-          compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-        fi
-        continue
-	;;
-
-      -allow-undefined)
-	allow_undefined=yes
+      -export-dynamic)
+	export_dynamic=yes
+	compile_command="$compile_command $export_dynamic_flag"
+	finalize_command="$finalize_command $export_dynamic_flag"
 	continue
 	;;
 
-      -dlopen)
-        prev=dlfiles
-        continue
-        ;;
-
-      -dlpreopen)
-        prev=dlprefiles
-        continue
-        ;;
-
-      -export-dynamic)
-        if test "$export_dynamic" != yes; then
-          export_dynamic=yes
-	  arg=`eval \\$echo "$export_dynamic_flag_spec"`
-
-          # Add the symbol object into the linking commands.
-	  compile_command="$compile_command @SYMFILE@"
-	  finalize_command="$finalize_command @SYMFILE@"
-        fi
-        ;;
-
       -L*)
-        dir=`$echo "$arg" | sed 's%^-L\(.*\)$%\1%'`
-        case "$dir" in
-        /*)
-          ;;
-        *)
-          $echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2
-          exit 1
-          ;;
-        esac
-        deplibs="$deplibs $arg"
-        ;;
+	dir=`echo "$arg" | sed 's%^-L\(.*\)$%\1%'`
+	case "$dir" in
+	/*)
+	  ;;
+	*)
+	  echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2
+	  exit 1
+	  ;;
+	esac
+	deplibs="$deplibs $arg"
+	;;
 
       -l*) deplibs="$deplibs $arg" ;;
 
+      -no-whole-archive) whole_archive=no ;;
+
       -o) prev=output ;;
 
       -rpath)
-        prev=rpath
-        continue
-        ;;
+	prev=install_libdir
+	continue
+	;;
 
       -static)
-	# We already handled this flag above.
+	link_static="`eval echo \"$link_static_flag\"`"
+	compile_command="$compile_command $link_static"
 	continue
 	;;
 
+      -version-file)
+	echo "$progname: \`-version-file' has been replaced by \`-version-info'" 1>&2
+	echo "$help" 1>&2
+	exit 1
+	;;
+
       -version-info)
-        prev=vinfo
-        continue
-        ;;
+	prev=vinfo
+	continue
+	;;
 
-      # Some other compiler flag.
-      -*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "$arg" | sed "$sed_quote_subst"`
-	case "$arg" in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	  arg="\"$arg\""
-	  ;;
-	esac
-        ;;
+      -whole-archive) whole_archive=yes ;;
 
-      *.o | *.a)
-        # A standard object.
-        objs="$objs $arg"
-        ;;
+      -*) cc="$cc $arg" ;; # Some other compiler flag.
 
-      *.lo)
-        # A library object.
-	if test "$prev" = dlfiles; then
-	  dlfiles="$dlfiles $arg"
-	  if test "$build_libtool_libs" = yes; then
-	    prev=
-	    continue
+      *.o)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.a)
+	# Find the relevant object directory and library name.
+	file=`echo "$arg" | sed 's%^.*/%%'`
+	dir=`echo "$arg" | sed 's%/[^/]*$%/%'`
+	test "$dir" = "$arg" && dir=
+
+	# If -whole-archive was specified, we need to link all the members.
+	if test "$whole_archive" = yes; then
+	  if test -f $arg; then :
 	  else
-	    # If libtool objects are unsupported, then we need to preload.
-	    prev=dlprefiles
+	    echo "$progname: \`$arg' does not exist" 1>&2
+	    echo "$help" 1>&2
+	    exit 1
 	  fi
-	fi
 
-	if test "$prev" = dlprefiles; then
-	  # Preload the old-style object.
-	  dlprefiles="$dlprefiles "`$echo "$arg" | sed 's/\.lo$/\.o/'`
-	  prev=
+	  # Get the names of the members of the archive.
+	  members=`$AR t $arg 2>/dev/null`
+	  for m in $members; do
+	    case "$m" in
+	    *.lo) libobjs="$libobjs $dir$m" ;;
+	    *.o)
+	      if test "$build_libtool_libs" = yes; then
+		objs="$objs $dir$m"
+	      else
+		libobjs="$libobjs $dir$m"
+	      fi
+	      ;;
+	    esac
+	  done
+	elif test -f "$dir$objdir/$file"; then
+	  # .libs/libfoo.a exists, so this is an archive of libobjects.
+	  libobjs="$libobjs $arg"
+	else
+	  # Standard archive.
+	  objs="$objs $arg"
 	fi
+	;;
+
+      *.lo)
+	# A library object.
 	libobjs="$libobjs $arg"
-        ;;
+	;;
 
       *.la)
-        # A libtool-controlled library.
+	# A libtool-controlled library.
 
-        dlname=
-        libdir=
-        library_names=
-        old_library=
+	libdir=
+	library_names=
+	old_library=
 
-        # Check to see that this really is a libtool archive.
-        if egrep "^# Generated by ltmain.sh" $arg >/dev/null 2>&1; then :
-        else
-          $echo "$progname: \`$arg' is not a valid libtool archive" 1>&2
-          exit 1
-        fi
+	# Check to see that this really is a libtool archive.
+	if egrep "^# Generated by $PROGRAM" $arg >/dev/null 2>&1; then :
+	else
+	  echo "$progname: \`$arg' is not a valid libtool archive" 1>&2
+	  exit 1
+	fi
 
-        # If there is no directory component, then add one.
-        case "$arg" in
-        */*) . $arg ;;
-        *) . ./$arg ;;
-        esac
-
-        if test -z "$libdir"; then
-          $echo "$progname: \`$arg' contains no -rpath information" 1>&2
-          exit 1
-        fi
+	# If there is no directory component, then add one.
+	case "$arg" in
+	*/*) . $arg ;;
+	*) . ./$arg ;;
+	esac
 
-        # Get the name of the library we link against.
-        linklib=
-        for l in $old_library $library_names; do
-          linklib="$l"
-        done
+	if test -z "$libdir"; then
+	  echo "$progname: \`$arg' contains no -rpath information" 1>&2
+	  exit 1
+	fi
 
-        if test -z "$linklib"; then
-          $echo "$progname: cannot find name of link library for \`$arg'" 1>&2
-          exit 1
-        fi
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
 
-        # Find the relevant object directory and library name.
-        name=`$echo "$arg" | sed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
-        dir=`$echo "$arg" | sed 's%/[^/]*$%%'`
-        if test "X$dir" = "X$arg"; then
-          dir="$objdir"
-        else
-          dir="$dir/$objdir"
-        fi
+	if test -z "$linklib"; then
+	  echo "$progname: cannot find name of link library for \`$arg'" 1>&2
+	  exit 1
+	fi
 
-        # This library was specified with -dlopen.
-        if test "$prev" = dlfiles; then
-          dlfiles="$dlfiles $arg"
-          if test -z "$dlname"; then
-            # If there is no dlname, we need to preload.
-            prev=dlprefiles
-          else
-            # We should not create a dependency on this library.
-            prev=
-            continue
-          fi
-        fi
+	# Find the relevant object directory and library name.
+	name=`echo "$arg" | sed 's%^.*/%%; s/\.la$//; s/^lib//'`
+	dir=`echo "$arg" | sed 's%/[^/]*$%%'`
+	if test "$dir" = "$arg"; then
+	  dir="$objdir"
+	else
+	  dir="$dir/$objdir"
+	fi
 
-        # The library was specified with -dlpreopen.
-        if test "$prev" = dlprefiles; then
-          # Prefer using a static library (so that no silly _DYNAMIC symbols
-          # are required to link).
-          if test -n "$old_library"; then
-            dlprefiles="$dlprefiles $dir/$old_library"
-          else
-            dlprefiles="$dlprefiles $dir/$linklib"
-          fi
-          prev=
-        fi
+	link_against_libtool_libs="$link_against_libtool_libs $arg"
+
+	if test "$build_libtool_libs" = yes; then
+	  if test -n "$shlibpath_var"; then
+	    # Make sure the rpath contains only unique directories.
+	    case "$temp_rpath " in
+	    "* $dir *") ;;
+	    *) temp_rpath="$temp_rpath $dir" ;;
+	    esac
+	  fi
 
-        if test "$build_libtool_libs" = yes && test -n "$library_names"; then
-          link_against_libtool_libs="$link_against_libtool_libs $arg"
-          if test -n "$shlibpath_var"; then
-            # Make sure the rpath contains only unique directories.
-            case "$temp_rpath " in
-            "* $dir *") ;;
-            *) temp_rpath="$temp_rpath $dir" ;;
-            esac
-          fi
-
-	  # FIXME: This is the magic to use -rpath.
-          if test -n "$hardcode_libdir_flag_spec"; then
-            if test -n "$hardcode_libdir_separator"; then
-              if test -z "$hardcode_libdirs"; then
-                # Put the magic libdir with the hardcode flag.
-                hardcode_libdirs="$libdir"
-                libdir="@HARDCODE_LIBDIRS@"
-              else
-                # Just accumulate the libdirs.
-                hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-                libdir=
-              fi
-            fi
-
-            if test -n "$libdir"; then
-              flag=`eval \\$echo \"$hardcode_libdir_flag_spec\"`
-
-              compile_command="$compile_command $flag"
-              finalize_command="$finalize_command $flag"
-            fi
-          elif test "$hardcode_runpath_var" = yes; then
-            # Do the same for the permanent run path.
-            case "$perm_rpath " in
-            "* $libdir *") ;;
-            *) perm_rpath="$perm_rpath $libdir" ;;
-            esac
-          fi
-
-
-          case "$hardcode_action" in
-          immediate)
-            if test "$hardcode_direct" = no; then
-              compile_command="$compile_command $dir/$linklib"
-            elif test "$hardcode_minus_L" = no; then
-              compile_command="$compile_command -L$dir -l$name"
-            elif test "$hardcode_shlibpath_var" = no; then
-              compile_shlibpath="$compile_shlibpath$dir:"
-              compile_command="$compile_command -l$name"
-            fi
-            ;;
-
-          relink)
-            # We need an absolute path.
-            case "$dir" in
-            /*) ;;
-            *)
-              absdir=`cd "$dir" && pwd`
-              if test -z "$absdir"; then
-                $echo "$progname: cannot determine absolute directory name of \`$dir'" 1>&2
-                exit 1
-              fi
-              dir="$absdir"
-              ;;
-            esac
-
-            if test "$hardcode_direct" = yes; then
-              compile_command="$compile_command $dir/$linklib"
-            elif test "$hardcode_minus_L" = yes; then
-              compile_command="$compile_command -L$dir -l$name"
-            elif test "$hardcode_shlibpath_var" = yes; then
-              compile_shlibpath="$compile_shlibpath$dir:"
-              compile_command="$compile_command -l$name"
-            fi
-            ;;
-
-          *)
-            $echo "$progname: \`$hardcode_action' is an unknown hardcode action" 1>&2
-            exit 1
-            ;;
-          esac
-
-          # Finalize command for both is simple: just hardcode it.
-          if test "$hardcode_direct" = yes; then
-            finalize_command="$finalize_command $libdir/$linklib"
-          elif test "$hardcode_minus_L" = yes; then
-            finalize_command="$finalize_command -L$libdir -l$name"
-          elif test "$hardcode_shlibpath_var" = yes; then
-            finalize_shlibpath="$finalize_shlibpath$libdir:"
-            finalize_command="$finalize_command -l$name"
+	  if test -n "$hardcode_libdir_flag_spec"; then
+	    if test -n "$hardcode_libdir_separator"; then
+	      if test -z "$hardcode_libdirs"; then
+		# Put the magic libdir with the hardcode flag.
+		hardcode_libdirs="$libdir"
+		libdir="@HARDCODE_LIBDIRS@"
+	      else
+		# Just accumulate the libdirs.
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		libdir=
+	      fi
+	    fi
+
+	    if test -n "$libdir"; then
+	      hardcode_libdir_flag=`eval echo \"$hardcode_libdir_flag_spec\"`
+	      compile_command="$compile_command $hardcode_libdir_flag"
+	      finalize_command="$finalize_command $hardcode_libdir_flag"
+	    fi
+	  fi
+
+	  case "$hardcode_action" in
+	  immediate)
+	    if test "$hardcode_direct" = no; then
+	      compile_command="$compile_command $dir/$linklib"
+	    elif test "$hardcode_minus_L" = no; then
+	      compile_command="$compile_command -L$dir -l$name"
+	    elif test "$hardcode_shlibpath_var" = no; then
+	      compile_shlibpath="$compile_shlibpath$dir:"
+	      compile_command="$compile_command -l$name"
+	    fi
+	    ;;
+
+	  relink)
+	    # We need an absolute path.
+	    case "$dir" in
+	    /*) ;;
+	    *)
+	      absdir=`cd "$dir" && pwd`
+	      if test -z "$absdir"; then
+		echo "$progname: cannot determine absolute directory name of \`$dir'" 1>&2
+		exit 1
+	      fi
+	      dir="$absdir"
+	      ;;
+	    esac
+
+	    if test "$hardcode_direct" = yes; then
+	      compile_command="$compile_command $dir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      compile_command="$compile_command -L$dir -l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      compile_shlibpath="$compile_shlibpath$dir:"
+	      compile_command="$compile_command -l$name"
+	    fi
+	    ;;
+
+	  *)
+	    echo "$progname: \`$hardcode_action' is an unknown hardcode action" 1>&2
+	    exit 1
+	    ;;
+	  esac
+
+	  # Finalize command for both is simple: just hardcode it.
+	  if test "$hardcode_direct" = yes; then
+	    finalize_command="$finalize_command $libdir/$linklib"
+	  elif test "$hardcode_minus_L" = yes; then
+	    finalize_command="$finalize_command -L$libdir -l$name"
+	  elif test "$hardcode_shlibpath_var" = yes; then
+	    finalize_shlibpath="$finalize_shlibpath$libdir:"
+	    finalize_command="$finalize_command -l$name"
           else
             # We can't seem to hardcode it, guess we'll fake it.
-            finalize_command="$finalize_command -L$libdir -l$name"
-          fi
+	    finalize_command="$finalize_command -L$libdir -l$name"
+	  fi
         else
           # Transform directly to old archives if we don't build new libraries.
-          if test -n "$pic_flag" && test -z "$old_library"; then
-            $echo "$progname: cannot find static library for \`$arg'" 1>&2
-            exit 1
-          fi
-
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_command="$compile_command $dir/$linklib"
-	    finalize_command="$finalize_command $dir/$linklib"
-	  else
-	    # Here we assume that "$hardcode_minus_L" != unsupported.
-	    # This is valid on all known static and shared platforms.
-	    compile_command="$compile_command -L$dir -l$name"
-	    finalize_command="$finalize_command -L$dir -l$name"
-	  fi
+	  test -z "$old_library" || linklib="$old_library"
+          compile_command="$compile_command $dir/$linklib"
+	  finalize_command="$finalize_command $dir/$linklib"
         fi
 	continue
-        ;;
+	;;
 
       *)
-        $echo "$progname: unknown file suffix for \`$arg'" 1>&2
-        $echo "$help" 1>&2
-        exit 1
-        ;;
+        echo "$progname: unknown file suffix for \`$arg'" 1>&2
+	echo "$help" 1>&2
+	exit 1
+	;;
       esac
 
-      # Now actually substitute the argument into the commands.
       compile_command="$compile_command $arg"
       finalize_command="$finalize_command $arg"
     done
 
     if test -n "$prev"; then
-      $echo "$progname: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
+      echo "$progname: the \`$prevarg' option requires an argument" 1>&2
+      echo "$help" 1>&2
       exit 1
     fi
 
+    # Substitute the hardcoded libdirs into the compile commands.
+    if test "$hardcode_libdir_colon_separated" = yes; then
+      compile_command=`echo "$compile_command" | sed "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
+      finalize_command=`echo "$finalize_command" | sed "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
+    fi
+
     oldlib=
     oldobjs=
     case "$output" in
     "")
-      $echo "$progname: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
+      echo "$progname: you must specify an output file" 1>&2
+      echo "$help" 1>&2
       exit 1
       ;;
 
     */*)
-      $echo "$progname: output file \`$output' must have no directory components" 1>&2
+      echo "$progname: output file \`$output' must have no directory components" 1>&2
       exit 1
       ;;
 
+    *.a)
+      # Old archive.
+      libname=`echo "$output" | sed 's/\.a$//'`
+      build_old_libs=yes
+
+      if test -n "$install_libdir"; then
+        echo "$progname: warning: \`-rpath' is ignored while linking old-style libraries" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	echo "$progname: warning: \`-version-info' is ignored while linking old-style libraries" 1>&2
+      fi
+      ;;
+
     *.la)
-      libname=`$echo "$output" | sed 's/\.la$//'`
+      libname=`echo "$output" | sed 's/\.la$//'`
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -788,34 +628,20 @@
       age=0
 
       if test -n "$objs"; then
-        $echo "$progname: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
-        exit 1
+	echo "$progname: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+	exit 1
       fi
 
       # How the heck are we supposed to write a wrapper for a shared library?
       if test -n "$link_against_libtool_libs"; then
-        $echo "$progname: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
-        exit 1
-      fi
-
-      if test -n "$dlfiles$dlprefiles"; then
-        $echo "$progname: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
-        # Nullify the symbol file.
-        compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
-        finalize_command=`$echo "$finalize_command" | sed "s% @SYMFILE@%%"`
-      fi
-
-      if test -z "$rpath"; then
-        $echo "$progname: you must specify an installation directory with \`-rpath'" 1>&2
-	$echo "$help" 1>&2
-        exit 1
+        echo "$progname: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
+	exit 1
       fi
 
-      set dummy $rpath
-      if test $# -gt 2; then
-	$echo "$progname: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      if test -z "$install_libdir"; then
+	echo "$progname: you must specify an installation directory with \`-rpath'" 1>&2
+	exit 1
       fi
-      install_libdir="$2"
 
       # Parse the version information argument.
       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
@@ -823,9 +649,9 @@
       IFS="$save_ifs"
 
       if test -n "$5"; then
-        $echo "$progname: too many parameters to \`-version-info'" 1>&2
-        $echo "$help" 1>&2
-        exit 1
+        echo "$progname: too many parameters to \`-version-info'" 1>&2
+	echo "$help" 1>&2
+	exit 1
       fi
 
       test -n "$2" && current="$2"
@@ -836,33 +662,33 @@
       case "$current" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$progname: CURRENT \`$current' is not a nonnegative integer" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+	echo "$progname: CURRENT \`$current' is not a nonnegative integer" 1>&2
+        echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
-        ;;
+	;;
       esac
 
       case "$revision" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$progname: REVISION \`$revision' is not a nonnegative integer" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+	echo "$progname: REVISION \`$revision' is not a nonnegative integer" 1>&2
+        echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
-        ;;
+	;;
       esac
 
       case "$age" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$progname: AGE \`$age' is not a nonnegative integer" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+	echo "$progname: AGE \`$age' is not a nonnegative integer" 1>&2
+        echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
-        ;;
+	;;
       esac
 
       if test $age -gt $current; then
-        $echo "$progname: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+        echo "$progname: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+        echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
       fi
 
@@ -872,40 +698,40 @@
       none) ;;
 
       linux)
-        version_vars="$version_vars major versuffix"
-        major=`expr $current - $age`
-        versuffix="$major.$age.$revision"
-        ;;
+	version_vars="$version_vars major versuffix"
+	major=`expr $current - $age`
+	versuffix="$major.$age.$revision"
+	;;
 
       osf)
-        version_vars="$version_vars versuffix verstring"
-        major=`expr $current - $age`
-        versuffix="$current.$age.$revision"
-        verstring="$versuffix"
-
-        # Add in all the interfaces that we are compatible with.
-        loop=$age
-        while test $loop != 0; do
-          iface=`expr $current - $loop`
-          loop=`expr $loop - 1`
-          verstring="$verstring:${iface}.0"
-        done
+	version_vars="$version_vars versuffix verstring"
+	major=`expr $current - $age`
+	versuffix="$current.$age.$revision"
+	verstring="$versuffix"
+
+	# Add in all the interfaces that we are compatible with.
+	loop=$age
+	while test $loop != 0; do
+	  iface=`expr $current - $loop`
+	  loop=`expr $loop - 1`
+	  verstring="$verstring:${iface}.0"
+	done
 
-        # Make executables depend on our current version.
-        verstring="$verstring:${current}.0"
-        ;;
+	# Make executables depend on our current version.
+	verstring="$verstring:${current}.0"
+	;;
 
       sunos)
-        version_vars="$version_vars major versuffix"
-        major="$current"
-        versuffix="$current.$revision"
-        ;;
+	version_vars="$version_vars major versuffix"
+	major="$current"
+	versuffix="$current.$revision"
+	;;
 
       *)
-        $echo "$progname: unknown library version type \`$version_type'" 1>&2
-        $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-        exit 1
-        ;;
+	echo "$progname: unknown library version type \`$version_type'" 1>&2
+	echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	exit 1
+	;;
       esac
 
       # Create the output directory, or remove our outputs if we need to.
@@ -914,316 +740,169 @@
         $run $rm $objdir/$libname.*
       else
         $show "$mkdir $objdir"
-        $run $mkdir $objdir || exit $?
-      fi
-
-      # Check to see if the archive will have undefined symbols.
-      if test "$allow_undefined" = yes; then
-        if test "$allow_undefined_flag" = unsupported; then
-          $echo "$progname: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-          build_libtool_libs=no
-	  build_old_libs=yes
-        fi
-      else
-        # Clear the flag.
-        allow_undefined_flag=
+	$run $mkdir $objdir || exit $?
       fi
 
       if test "$build_libtool_libs" = yes; then
-        # Get the real and link names of the library.
-        library_names=`eval \\$echo \"$library_names_spec\"`
-        set dummy $library_names
-        realname="$2"
-        shift; shift
+	# Get the real and link names of the library.
+	library_names=`eval echo \"$library_names_spec\"`
+	set dummy $library_names
+	realname="$2"
+	shift; shift
 
-        if test -n "$soname_spec"; then
-          soname=`eval \\$echo \"$soname_spec\"`
-        else
-          soname="$realname"
-        fi
+	if test -n "$soname_spec"; then
+	  soname=`eval echo \"$soname_spec\"`
+	else
+	  soname="$realname"
+	fi
 
-        lib="$objdir/$realname"
-        linknames=
-        for link
-        do
-          linknames="$linknames $link"
-        done
+	lib="$objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $objdir/$link"
+	done
 
-        # Use standard objects if they are PIC.
-        test -z "$pic_flag" && libobjs=`$echo "$libobjs " | sed -e 's/\.lo /.o /g' -e 's/ $//g'`
+	# Use standard objects if they are PIC.
+	test -z "$pic_flag" && libobjs=`echo "$libobjs " | sed 's/\.lo /.o /g; s/ $//g'`
 
-        # Do each of the archive commands.
-        cmds=`eval \\$echo \"$archive_cmds\"`
-        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-        for cmd in $cmds; do
-          IFS="$save_ifs"
-          $show "$cmd"
-          $run eval "$cmd" || exit $?
-        done
-        IFS="$save_ifs"
+	# Do each of the archive commands.
+	cmds=`eval echo \"$archive_cmds\"`
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  eval "$run $cmd" || exit $?
+	done
+	IFS="$save_ifs"
 
-        # Create links to the real library.
-        for link in $linknames; do
-          $show "(cd $objdir && $LN_S $realname $link)"
-          $run eval '(cd $objdir && $LN_S $realname $link)' || exit $?
-        done
+	# Create links to the real library.
+	for link in $linknames; do
+	  $show "$ln_s $realname $link"
+	  $run $ln_s $realname $link || exit $?
+	done
 
-        # If -export-dynamic was specified, set the dlname.
-        if test "$export_dynamic" = yes; then
-          # On all known operating systems, these are identical.
-          dlname="$soname"
-        fi
+	# If -export-dynamic was specified, set the dlname.
+	if test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
       fi
       ;;
 
     *.lo | *.o)
       if test -n "$link_against_libtool_libs"; then
-        $echo "$progname: error: cannot link libtool libraries into reloadable objects" 1>&2
-        exit 1
+	echo "$progname: error: cannot link libtool libraries into reloadable objects" 1>&2
+	exit 1
       fi
 
       if test -n "$deplibs"; then
-        $echo "$progname: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles"; then
-        $echo "$progname: warning: \`-dlopen' is ignored while creating objects" 1>&2
-        # Nullify the symbol file.
-        compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
-        finalize_command=`$echo "$finalize_command" | sed "s% @SYMFILE@%%"`
+	echo "$progname: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
       fi
 
-      if test -n "$rpath"; then
-        $echo "$progname: warning: \`-rpath' is ignored while creating objects" 1>&2
+      if test -n "$install_libdir"; then
+        echo "$progname: warning: \`-rpath' is ignored while creating objects" 1>&2
       fi
 
       if test -n "$vinfo"; then
-        $echo "$progname: warning: \`-version-info' is ignored while creating objects" 1>&2
+	echo "$progname: warning: \`-version-info' is ignored while creating objects" 1>&2
       fi
 
       case "$output" in
       *.lo)
-        if test -n "$objs"; then
-          $echo "$progname: cannot build library object \`$output' from non-libtool objects" 1>&2
-          exit 1
-        fi
-        libobj="$output"
-        obj=`$echo "$output" | sed 's/\.lo$/.o/'`
-        ;;
+	if test -n "$objs"; then
+	  echo "$progname: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit 1
+	fi
+	libobj="$output"
+	obj=`echo "$output" | sed 's/\.lo$/.o/'`
+	;;
       *)
         libobj=
-        obj="$output"
-        ;;
+	obj="$output"
+	;;
       esac
 
       # Delete the old objects.
       $run $rm $obj $libobj
 
-      # Create the old-style object.
-      reload_objs="$objs"`$echo "$libobjs " | sed -e 's/[^       ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
+      # Create the old-style object (skipping any convenience libraries).
+      # FIXME: skipping them is simplistic.  We should determine which members
+      # are actually needed to resolve symbols.
+      reload_objs="$objs"`echo "$libobjs " | sed 's/[^ 	]*\.a //g; s/\.lo /.o /g; s/ $//g'`
 
       output="$obj"
-      cmds=`eval \\$echo \"$reload_cmds\"`
+      cmds=`eval echo \"$reload_cmds\"`
       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
       for cmd in $cmds; do
         IFS="$save_ifs"
         $show "$cmd"
-        $run eval "$cmd" || exit $?
+	eval "$run $cmd" || exit $?
       done
       IFS="$save_ifs"
 
       # Exit if we aren't doing a library object file.
       test -z "$libobj" && exit 0
 
-      if test "$build_libtool_libs" != yes; then
-        # Create an invalid libtool object if no PIC, so that we don't
-        # accidentally link it into a program.
-        $show "$echo timestamp > $libobj"
-        $run eval "\$echo timestamp > $libobj" || exit $?
-        exit 0
-      fi
-
-      if test -n "$pic_flag"; then
-        # Only do commands if we really have different PIC objects.
-        reload_objs="$libobjs"
-        output="$libobj"
-        cmds=`eval \\$echo \"$reload_cmds\"`
+      if test "$build_libtool_libs" = yes && test -n "$pic_flag"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs"
+	output="$libobj"
+        cmds=`eval echo \"$reload_cmds\"`
         IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
         for cmd in $cmds; do
           IFS="$save_ifs"
           $show "$cmd"
-          $run eval "$cmd" || exit $?
+          eval "$run $cmd" || exit $?
         done
         IFS="$save_ifs"
       else
         # Just create a symlink.
-        $show "$LN_S $obj $libobj"
-        $run $LN_S $obj $libobj || exit 1
+        $show "$ln_s $obj $libobj"
+        $run $ln_s $obj $libobj || $run $cp_p $obj $libobj || exit 1
       fi
 
       exit 0
       ;;
 
     *)
-      if test -n "$vinfo"; then
-        $echo "$progname: warning: \`-version-info' is ignored while linking programs" 1>&2
+      if test -n "$install_libdir"; then
+        echo "$progname: warning: \`-rpath' is ignored while linking programs" 1>&2
       fi
 
-      if test -n "$rpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath; do
-          if test -n "$hardcode_libdir_flag_spec"; then
-            if test -n "$hardcode_libdir_separator"; then
-              if test -z "$hardcode_libdirs"; then
-                # Put the magic libdir with the hardcode flag.
-                hardcode_libdirs="$libdir"
-                libdir="@HARDCODE_LIBDIRS@"
-              else
-                # Just accumulate the libdirs.
-                hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-                libdir=
-              fi
-            fi
-
-            if test -n "$libdir"; then
-              flag=`eval \\$echo \"$hardcode_libdir_flag_spec\"`
-
-              compile_command="$compile_command $flag"
-              finalize_command="$finalize_command $flag"
-            fi
-          elif test "$hardcode_runpath_var" = yes; then
-            case "$perm_rpath " in
-            "* $libdir *") ;;
-            *) perm_rpath="$perm_rpath $libdir" ;;
-            esac
-          fi
-	done
+      if test -n "$vinfo"; then
+	echo "$progname: warning: \`-version-info' is ignored while linking programs" 1>&2
       fi
 
-      # Substitute the hardcoded libdirs into the compile commands.
-      if test -n "$hardcode_libdir_separator"; then
-	compile_command=`$echo "$compile_command" | sed "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
-	finalize_command=`$echo "$finalize_command" | sed "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
-      fi
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-        # Transform all the library objects into standard objects.
-        compile_command=`$echo "$compile_command " | sed -e 's/\.lo /.o /g' -e 's/ $//'`
-        finalize_command=`$echo "$finalize_command " | sed -e 's/\.lo /.o /g' -e 's/ $//'`
-      fi
-
-      if test "$export_dynamic" = yes && test -n "$global_symbol_pipe" && test -n "$NM"; then
-        # Add our own program objects to the preloaded list.
-        dlprefiles=`$echo "$objs$dlprefiles " | sed -e 's/\.lo /.o /g' -e 's/ $//'`
-
-        # Discover the nlist of each of the dlfiles.
-        dlsyms="$objdir/${output}S.c"
-        nlist="$objdir/${output}.nm"
-
-        $run rm -f "$nlist" "$nlist"T
-        for arg in $dlprefiles; do
-          $echo "extracting global symbols from \`$arg'"
-          $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-        done
-
-        # Parse the name list into a C file.
-        $echo "creating $dlsyms"
-        if test -z "$run"; then
-	  # Try sorting and uniquifying the output.
-	  if sort "$nlist" | uniq > "$nlist"T; then
-	    mv -f "$nlist"T "$nlist"
-	    wcout=`wc "$nlist" 2>/dev/null`
-	    count=`$echo "$wcout" | sed 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-	    test "$wcout" = "$count" && count=-1
-	  else
-	    rm -f "$nlist"T
-	    count=-1
-	  fi
-
-          cat <<EOF > "$dlsyms"
-/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */
-
-/* Prevent the only kind of circular reference mistakes we can make. */
-#define dld_preloaded_symbol_count some_other_symbol
-#define dld_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */
-EOF
-          if test -f "$nlist"; then
-            sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$dlsyms"
-          else
-            $echo "/* NONE */" >> "$dlsyms"
-          fi
-
-          cat <<EOF >> "$dlsyms"
-
-#undef dld_preloaded_symbol_count
-#undef dld_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define __ptr_t void *
-#else
-# define __ptr_t char *
-#endif
-
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $count;
-
-/* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
-}
-dld_preloaded_symbols[] =
-{
-EOF
-
-          if test -f "$nlist"; then
-            sed 's/^\(.*\) \(.*\)$/  {"\1", \&\2},/' < "$nlist" >> "$dlsyms"
-          fi
-
-          cat <<\EOF >> "$dlsyms"
-  {0},
-};
-EOF
-        fi
-        $run rm -f "$nlist" "$nlist"T
-
-        # Now compile the dynamic symbol file.
-        $show "(cd $objdir && $CC -c$no_builtin_flag \"${output}S.c\")"
-        $run eval '(cd $objdir && $CC -c$no_builtin_flag "${output}S.c")' || exit $?
-
-        # Transform the symbol file into the correct name.
-        compile_command=`$echo "$compile_command" | sed "s%@SYMFILE@%$objdir/${output}S.o%"`
-        finalize_command=`$echo "$finalize_command" | sed "s%@SYMFILE@%$objdir/${output}S.o%"`
-      elif test "$export_dynamic" != yes; then
-        test -n "$dlfiles$dlprefiles" && $echo "$progname: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
-      else
-        # We keep going just in case the user didn't refer to
-        # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe
-        # really was required.
-        $echo "$progname: not configured to extract global symbols from dlpreopened files" 1>&2
-
-        # Nullify the symbol file.
-        compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
-        finalize_command=`$echo "$finalize_command" | sed "s% @SYMFILE@%%"`
+      if test -n "$libobjs"; then
+	# Transform all the library objects into standard objects.
+	compile_command=`echo "$compile_command " | sed 's/\.lo /.o /g; s/ $//'`
       fi
 
       if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
-        # Replace the output file specification.
-        compile_command=`$echo "$compile_command" | sed 's%@OUTPUT@%'"$output"'%g'`
-        finalize_command=`$echo "$finalize_command" | sed 's%@OUTPUT@%'"$output"'%g'`
-
-        # We have no uninstalled library dependencies, so finalize right now.
-        $show "$compile_command"
-        $run eval "$compile_command"
-        exit $?
+	# Replace the output file specification.
+	compile_command=`echo "$compile_command" | sed 's%@OUTPUT@%'"$output"'%g'`
+	finalize_command=`echo "$finalize_command" | sed 's%@OUTPUT@%'"$output"'%g'`
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$compile_command"
+	$run $compile_command
+	status=$?
+
+	# If we failed to link statically, then try again.
+	if test $status -ne 0 && test -n "$link_static"; then
+	  echo "$progname: cannot link \`$output' statically; retrying semi-dynamically" 1>&2
+	  compile_command=`echo "$compile_command " | sed "s% $link_static % %;s/ $//"`
+	  $show "$finalize_command"
+	  $run $finalize_command
+	  status=$?
+	fi
+	exit $status
       fi
 
       # Replace the output file specification.
-      compile_command=`$echo "$compile_command" | sed 's%@OUTPUT@%'"$objdir/$output"'%g'`
-      finalize_command=`$echo "$finalize_command" | sed 's%@OUTPUT@%'"$objdir/$output"'T%g'`
+      compile_command=`echo "$compile_command" | sed 's%@OUTPUT@%'"$objdir/$output"'%g'`
+      finalize_command=`echo "$finalize_command" | sed 's%@OUTPUT@%'"$objdir/$output"'T%g'`
 
       # Create the binary in the object directory, then wrap it.
       if test -d $objdir; then :
@@ -1234,69 +913,55 @@
 
       if test -n "$shlibpath_var"; then
         # We should set the shlibpath_var
-        rpath=
-        for dir in $temp_rpath; do
-          case "$dir" in
-          /*)
-            # Absolute path.
-            rpath="$rpath$dir:"
-            ;;
-          *)
-            # Relative path: add a thisdir entry.
-            rpath="$rpath\$thisdir/$dir:"
-            ;;
-          esac
-        done
-        temp_rpath="$rpath"
+	rpath=
+	for dir in $temp_rpath; do
+	  case "$dir" in
+	  /*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
       fi
 
       # Delete the old output file.
       $run $rm $output
 
       if test -n "$compile_shlibpath"; then
-        compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
+	compile_command="$shlibpath_var=$compile_shlibpath\$$shlibpath_var $compile_command"
       fi
       if test -n "$finalize_shlibpath"; then
-        finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      if test -n "$perm_rpath"; then
-        # We should set the runpath_var.
-        rpath=
-        for dir in $perm_rpath; do
-          rpath="$rpath$dir:"
-        done
-        compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
-        finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
+	finalize_command="$shlibpath_var=$finalize_shlibpath\$$shlibpath_var $finalize_command"
       fi
 
       case "$hardcode_action" in
       relink)
-        # AGH! Flame the AIX and HP-UX people for me, will ya?
-        $echo "$progname: warning: using a buggy system linker" 1>&2
-        $echo "$progname: relinking will be required before \`$output' can be installed" 1>&2
-        ;;
+	# AGH! Flame the AIX and HP-UX people for me, will ya?
+	echo "$progname: warning: using a buggy system linker" 1>&2
+	echo "$progname: relinking will be required before \`$output' can be installed" 1>&2
+	;;
       esac
 
       $show "$compile_command"
-      $run eval "$compile_command" || exit $?
+      eval "$run $compile_command" || exit $?
 
       # Now create the wrapper script.
-      $echo "creating $output"
-
-      # Quote the finalize command for shipping.
-      finalize_command=`$echo "$finalize_command" | sed "$sed_quote_subst"`
+      echo "creating $output"
 
       # Only actually do things if our run command is non-null.
       if test -z "$run"; then
-        $rm $output
-        trap "$rm $output; exit 1" 1 2 15
+	$rm $output
+	trap "$rm $output; exit 1" 1 2 15
 
-        cat > $output <<EOF
+	cat > $output <<EOF
 #! /bin/sh
 
 # $output - temporary wrapper script for $objdir/$output
-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -1307,83 +972,60 @@
 # This environment variable determines our operation mode.
 if test "\$libtool_install_magic" = "$magic"; then
   # install mode needs the following variables:
-  link_against_libtool_libs='$link_against_libtool_libs'
+  link_against_libtool_libs="$link_against_libtool_libs"
   finalize_command="$finalize_command"
 else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test "\$libtool_execute_magic" = "$magic"; then :
-  else
-    echo='$echo'
-    file="\$0"
-  fi
-
   # Find the directory that this script lives in.
-  thisdir=\`\$echo "\$file" | sed 's%/[^/]*$%%'\`
-  test "x\$thisdir" = "x\$file" && thisdir=.
+  thisdir=\`echo \$0 | sed 's%/[^/]*$%%'\`
+  test "x\$thisdir" = "x\$0" && thisdir=.
 
   # Try to get the absolute directory name.
   absdir=\`cd "\$thisdir" && pwd\`
   test -n "\$absdir" && thisdir="\$absdir"
 
   progdir="\$thisdir/$objdir"
-  program='$output'
-
-  # If the \$file dir failed (maybe due to symlink), try a hardcoded dir.
-  oprogdir="\$progdir"
-  if test -f "\$progdir/\$program"; then :
-  else
-    thisdir='`pwd`'
-    progdir="\$thisdir/$objdir"
-  fi
+  program="$output"
 
   if test -f "\$progdir/\$program"; then
-EOF
+    # Run the actual program with our arguments.
+    args=
+    for arg
+    do
+      # Quote arguments (to preserve shell metacharacters).
+      args="\$args '\$arg'"
+    done
 
-        # Export our shlibpath_var if we have one.
-        if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-          cat >> $output <<EOF
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var="$temp_rpath\$$shlibpath_var"
+    # Export the path to the program.
+    PATH="\$progdir:\$PATH"
+    export PATH
+EOF
 
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    $shlibpath_var=\`\$echo \$$shlibpath_var | sed -e 's/:*\$//'\`
+	# Export our shlibpath_var if we have one.
+	if test -n "$shlibpath_var" && test -n "$rpath"; then
+	  cat >> $output <<EOF
 
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var="$rpath\$$shlibpath_var"
     export $shlibpath_var
-
 EOF
-        fi
+	fi
 
         cat >> $output <<EOF
-    if test "\$libtool_execute_magic" != "$magic"; then
-      # Run the actual program with our arguments.
-      args=
-      for arg
-      do
-        # Quote arguments (to preserve shell metacharacters).
-	sed_quote_subst='$sed_quote_subst'
-	arg=\`\$echo "\$arg" | sed "\$sed_quote_subst"\`
-        args="\$args \\"\$arg\\""
-      done
 
-      # Export the path to the program.
-      PATH="\$progdir:\$PATH"
-      export PATH
+    eval "exec \$program \$args"
 
-      eval "exec \$program \$args"
-
-      \$echo "\$0: cannot exec \$program \$args"
-      exit 1
-    fi
+    echo "\$0: cannot exec \$program \$args"
+    exit 1
   else
     # The program doesn't exist.
-    \$echo "\$0: error: neither \$oprogdir/\$program nor \$progdir/\$program exists" 1>&2
-    \$echo "This script is just a wrapper for \$program." 1>&2
-    \$echo "See the $PACKAGE documentation for more information." 1>&2
+    echo "\$0: error: \$progdir/\$program does not exist" 1>&2
+    echo "This script is just a wrapper for \$program." 1>&2
+    echo "See the $PACKAGE documentation for more information." 1>&2
     exit 1
   fi
 fi
 EOF
-        chmod +x $output
+	chmod +x $output
       fi
       exit 0
       ;;
@@ -1395,26 +1037,60 @@
       # Now set the variables for building old libraries.
       oldlib="$objdir/$libname.a"
 
-      # Transform .lo files to .o files.
-      oldobjs="$objs"`$echo "$libobjs " | sed -e 's/[^   ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
+      # Transform .lo files to .o (skipping convenience libraries).
+      # FIXME: skipping them is simplistic.  We should determine which members
+      # are actually needed to resolve symbols.
+      oldobjs="$objs"`echo "$libobjs " | sed 's/[^ 	]*\.a //g; s/\.lo /.o /g; s/ $//g'`
 
       if test -d "$objdir"; then
-        $show "$rm $oldlib"
-        $run $rm $oldlib
+	$show "$rm $oldlib"
+	$run $rm $oldlib
       else
-        $show "$mkdir $objdir"
-        $run $mkdir $objdir
+	$show "$mkdir $objdir"
+	$run $mkdir $objdir
       fi
 
       # Do each command in the archive commands.
-      cmds=`eval \\$echo \"$old_archive_cmds\"`
+      cmds=`eval echo \"$old_archive_cmds\"`
       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
       for cmd in $cmds; do
         IFS="$save_ifs"
         $show "$cmd"
-        $run eval "$cmd" || exit $?
+	eval "$run $cmd" || exit $?
       done
       IFS="$save_ifs"
+
+      case "$output" in
+      *.a)
+	# Just move into place if there were any non-libtool objects.
+	if test -n "$objs"; then
+	  $show "$mv $oldlib $output"
+	  $run $mv $oldlib $output
+
+	elif test -z "$pic_flag" || test "$build_libtool_libs" != yes; then
+	  # Just symlink if libtool objects are the same.
+	  $show "$rm $output"
+	  $run $rm $output
+	  $show "$ln_s $oldlib $output"
+	  $run $ln_s $oldlib $output
+
+	else
+	  # Create an archive of libtool objects.
+	  oldlib="$output"
+	  oldobjs="$libobjs"
+
+	  # Do each command in the archive commands.
+	  cmds=`eval echo \"$old_archive_cmds\"`
+	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    eval "$run $cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+	fi
+	;;
+      esac
     fi
 
     # Now create the libtool archive.
@@ -1423,16 +1099,13 @@
       old_library=
       test "$build_old_libs" = yes && old_library="$libname.a"
 
-      $echo "creating $output"
+      echo "creating $output"
 
       # Only create the output if not a dry run.
       if test -z "$run"; then
-        cat > $output <<EOF
+	cat > $output <<EOF
 # $output - a libtool library file
-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
-
-# The name that we can dlopen(3).
-dlname='$dlname'
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
 
 # Names of this library.
 library_names='$library_names'
@@ -1440,6 +1113,9 @@
 # The name of the static archive.
 old_library='$old_library'
 
+# The name that we can dlopen(3).
+dlname='$dlname'
+
 # Version information for $libname.
 current=$current
 age=$age
@@ -1449,11 +1125,6 @@
 libdir='$install_libdir'
 EOF
       fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $objdir && $LN_S ../$output $output)"
-      $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1
       ;;
     esac
     exit 0
@@ -1464,14 +1135,7 @@
     progname="$progname: install"
 
     # The first argument is the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "$nonopt" | sed "$sed_quote_subst"`
-    case "$arg" in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$arg"
+    install_prog="$nonopt"
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1485,8 +1149,8 @@
     do
       if test -n "$dest"; then
         files="$files $dest"
-        dest="$arg"
-        continue
+	dest="$arg"
+	continue
       fi
 
       case "$arg" in
@@ -1496,95 +1160,64 @@
       -m) prev="-m" ;;
       -o) prev="-o" ;;
       -s)
-        stripme=" -s"
-        continue
-        ;;
+	stripme=" -s"
+	continue
+	;;
       -*) ;;
 
       *)
-        # If the previous option needed an argument, then skip it.
-        if test -n "$prev"; then
-          prev=
-        else
-          dest="$arg"
-          continue
-        fi
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest="$arg"
+	  continue
+	fi
         ;;
       esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "$arg" | sed "$sed_quote_subst"`
-      case "$arg" in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
       install_prog="$install_prog $arg"
     done
 
     if test -z "$install_prog"; then
-      $echo "$progname: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
+      echo "$progname: you must specify an install program" 1>&2
+      echo "$help" 1>&2
       exit 1
     fi
 
     if test -n "$prev"; then
-      $echo "$progname: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
+      echo "$progname: the \`$prev' option requires an argument" 1>&2
+      echo "$help" 1>&2
       exit 1
     fi
 
     if test -z "$files"; then
       if test -z "$dest"; then
-        $echo "$progname: no file or destination specified" 1>&2
+        echo "$progname: no file or destination specified" 1>&2
       else
-        $echo "$progname: you must specify a destination" 1>&2
+	echo "$progname: you must specify a destination" 1>&2
       fi
-      $echo "$help" 1>&2
+      echo "$help" 1>&2
       exit 1
     fi
 
     # Strip any trailing slash from the destination.
-    dest=`$echo "$dest" | sed 's%/$%%'`
+    dest=`echo "$dest" | sed 's%/$%%'`
 
     # Check to see that the destination is a directory.
     test -d "$dest" && isdir=yes
     if test -n "$isdir"; then
       destdir="$dest"
-      destname=
     else
-      destdir=`$echo "$dest" | sed 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "$dest" | sed 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test $# -gt 2; then
-        $echo "$progname: \`$dest' is not a directory" 1>&2
-        $echo "$help" 1>&2
-        exit 1
-      fi
+      destdir=`echo "$dest" | sed 's%/[^/]*$%%'`
     fi
     case "$destdir" in
     /*) ;;
     *)
-      for file in $files; do
-        case "$file" in
-        *.lo) ;;
-        *)
-          $echo "$progname: \`$destdir' must be an absolute directory name" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-          ;;
-        esac
-      done
-      ;;
+      echo "$progname: $destdir must be an absolute directory name" 1>&2
+      echo "$help" 1>&2
+      exit 1
     esac
 
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
     staticlibs=
     future_libdirs=
     current_libdirs=
@@ -1593,69 +1226,69 @@
       # Do each installation.
       case "$file" in
       *.a)
-        # Do the static libraries later.
-        staticlibs="$staticlibs $file"
-        ;;
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
 
       *.la)
-        # Check to see that this really is a libtool archive.
-        if egrep "^# Generated by ltmain.sh" $file >/dev/null 2>&1; then :
-        else
-          $echo "$progname: \`$file' is not a valid libtool archive" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-        fi
+	# Check to see that this really is a libtool archive.
+	if egrep "^# Generated by $PROGRAM" $file >/dev/null 2>&1; then :
+	else
+	  echo "$progname: \`$file' is not a valid libtool archive" 1>&2
+	  echo "$help" 1>&2
+	  exit 1
+	fi
 
-        library_names=
-        old_library=
-        # If there is no directory component, then add one.
-        case "$file" in
-        */*) . $file ;;
-        *) . ./$file ;;
-        esac
-
-        # Add the libdir to current_libdirs if it is the destination.
-        if test "X$destdir" = "X$libdir"; then
-          case "$current_libdirs " in
-          "* $libdir *") ;;
-          *) current_libdirs="$current_libdirs $libdir" ;;
-          esac
-        else
-          # Note the libdir as a future libdir.
-          case "$future_libdirs " in
-          "* $libdir *") ;;
-          *) future_libdirs="$future_libdirs $libdir" ;;
-          esac
-        fi
+	library_names=
+	old_library=
+	# If there is no directory component, then add one.
+	case "$file" in
+	*/*) . $file ;;
+	*) . ./$file ;;
+	esac
 
-        dir="`$echo "$file" | sed 's%/[^/]*$%%'`/"
-        test "X$dir" = "X$file/" && dir=
-        dir="$dir$objdir"
-
-        # See the names of the shared library.
-        set dummy $library_names
-        if test -n "$2"; then
-          realname="$2"
-          shift
-          shift
-
-          # Install the shared library and build the symlinks.
-          $show "$install_prog $dir/$realname $destdir/$realname"
-          $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
-          test "X$dlname" = "X$realname" && dlname=
-
-          # Support stripping libraries.
-          if test -n "$stripme"; then
-            if test -n "$striplib"; then
-              $show "$striplib $destdir/$realname"
-              $run $striplib $destdir/$realname || exit $?
-            else
-              $echo "$progname: warning: no library stripping program" 1>&2
-            fi
-          fi
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "$destdir" = "$libdir"; then
+	  case "$current_libdirs " in
+	  "* $libdir *") ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  "* $libdir *") ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir="`echo "$file" | sed 's%/[^/]*$%%'`/"
+	test "$dir" = "$file/" && dir=
+	dir="$dir$objdir"
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$realname $destdir/$realname"
+	  eval "$run $install_prog $dir/$realname $destdir/$realname" || exit $?
+	  test "X$dlname" = "X$realname" && dlname=
+
+	  # Support stripping libraries.
+	  if test -n "$stripme"; then
+	    if test -n "$striplib"; then
+	      $show "$striplib $destdir/$realname"
+	      $run $striplib $destdir/$realname || exit $?
+	    else
+	      echo "$progname: warning: no library stripping program" 1>&2
+	    fi
+	  fi
 
-          if test $# -gt 0; then
-            # Delete the old symlinks.
+	  if test -n "$1"; then
+	    # Delete the old symlinks.
             rmcmd="$rm"
             for linkname
             do
@@ -1664,182 +1297,146 @@
             $show "$rmcmd"
             $run $rmcmd
 
-            # ... and create new ones.
-            for linkname
-            do
-              test "X$dlname" = "X$linkname" && dlname=
-              $show "(cd $destdir && $LN_S $realname $linkname)"
-              $run eval "(cd $destdir && $LN_S $realname $linkname)"
-            done
-          fi
-
-          if test -n "$dlname"; then
-            # Install the dynamically-loadable library.
-            $show "$install_prog $dir/$dlname $destdir/$dlname"
-            $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
-          fi
-
-          # Do each command in the postinstall commands.
-          lib="$destdir/$realname"
-          cmds=`eval \\$echo \"$postinstall_cmds\"`
-          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-          for cmd in $cmds; do
-            IFS="$save_ifs"
-            $show "$cmd"
-            $run eval "$cmd" || exit $?
-          done
-          IFS="$save_ifs"
-        fi
+	    # ... and create new ones.
+	    for linkname
+	    do
+	      test "X$dlname" = "X$linkname" && dlname=
+	      $show "$ln_s $realname $destdir/$linkname"
+	      $run $ln_s $realname $destdir/$linkname
+	    done
+	  fi
 
-        # Install the pseudo-library for information purposes.
-        name=`$echo "$file" | sed 's%^.*/%%'`
-        $show "$install_prog $file $destdir/$name"
-        $run eval "$install_prog $file $destdir/$name" || exit $?
+	  if test -n "$dlname"; then
+	    # Install the dynamically-loadable library.
+	    $show "$install_prog $dir/$dlname $destdir/$dlname"
+	    eval "$run $install_prog $dir/$dlname $destdir/$dlname" || exit $?
+	  fi
 
-        # Maybe install the static library, too.
-        test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-        ;;
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  cmds=`eval echo \"$postinstall_cmds\"`
+	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    eval "$run $cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+	fi
 
-      *.lo)
-        # Install (i.e. copy) a libtool object.
+	# Install the pseudo-library for information purposes.
+	name=`echo "$file" | sed 's%^.*/%%'`
+	$show "$install_prog $file $destdir/$name"
+	$run $install_prog $file $destdir/$name || exit $?
 
-        # Figure out destination file name, if it wasn't already specified.
-        if test -n "$destname"; then
-          destfile="$destdir/$destname"
-        else
-          destfile=`$echo "$file" | sed 's%^.*/%%'`
-          destfile="$destdir/$destfile"
-        fi
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
 
-        # Deduce the name of the destination old-style object file.
-        case "$destfile" in
-        *.lo)
-          staticdest=`$echo "$destfile" | sed 's/\.lo$/\.o/'`
-          ;;
-        *.o)
-          staticdest="$destfile"
-          destfile=
-          ;;
-        *)
-          $echo "$progname: cannot copy a libtool object to \`$destfile'" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-          ;;
-        esac
-
-        # Install the libtool object if requested.
-        if test -n "$destfile"; then
-          $show "$install_prog $file $destfile"
-          $run eval "$install_prog $file $destfile" || exit $?
-        fi
+      *)
+	# Do a test to see if this is really a libtool program.
+	if egrep "^# Generated by $PROGRAM" $file >/dev/null 2>&1; then
+	  # This variable tells wrapper scripts just to set variables rather
+	  # than running their programs.
+	  libtool_install_magic="$magic"
+	  link_against_libtool_libs=
+	  finalize_command=
 
-        # Install the old object if enabled.
-        if test "$build_old_libs" = yes; then
-          # Deduce the name of the old-style object file.
-          staticobj=`$echo "$file" | sed 's/\.lo$/\.o/'`
+	  # If there is no directory component, then add one.
+	  case "$file" in
+	  */*) . $file ;;
+	  *) . ./$file ;;
+	  esac
 
-          $show "$install_prog $staticobj $staticdest"
-          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-        fi
-        exit 0
-        ;;
+	  # Check the variables that should have been set.
+	  if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
+	    echo "$progname: invalid libtool wrapper script \`$file'" 1>&2
+	    exit 1
+	  fi
 
-      *)
-        # Do a test to see if this is really a libtool program.
-        if egrep '^# Generated by ltmain.sh' $file >/dev/null 2>&1; then
-          link_against_libtool_libs=
-          finalize_command=
-
-          # If there is no directory component, then add one.
-          case "$file" in
-          */*) . $file ;;
-          *) . ./$file ;;
-          esac
-
-          # Check the variables that should have been set.
-          if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
-            $echo "$progname: invalid libtool wrapper script \`$file'" 1>&2
-            exit 1
-          fi
-
-          finalize=yes
-          for lib in $link_against_libtool_libs; do
-            # Check to see that each library is installed.
-            libdir=
-            if test -f "$lib"; then
-              # If there is no directory component, then add one.
-              case "$lib" in
-              */*) . $lib ;;
-              *) . ./$lib ;;
-              esac
-            fi
-            libfile="$libdir/`$echo "$lib" | sed 's%^.*/%%g'`"
-            if test -z "$libdir"; then
-              $echo "$progname: warning: \`$lib' contains no -rpath information" 1>&2
-            elif test -f "$libfile"; then :
-            else
-              $echo "$progname: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-              finalize=no
-            fi
-          done
-
-          if test "$hardcode_action" = relink; then
-            if test "$finalize" = yes; then
-              $echo "$progname: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
-              $show "$finalize_command"
-              if $run eval "$finalize_command"; then :
-              else
-                $echo "$progname: error: relink \`$file' with the above command before installing it" 1>&2
-                continue
-              fi
-              file="$objdir/$file"T
-            else
-              $echo "$progname: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
-            fi
-          else
-            # Install the binary that we compiled earlier.
-	    file=`$echo "$file" | sed "s%\([^/]*\)$%$objdir/\1%"`
-          fi
-        fi
+	  finalize=yes
+	  for lib in $link_against_libtool_libs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case "$lib" in
+	      */*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/`echo "$lib" | sed 's%^.*/%%g'`"
+	    if test -z "$libdir"; then
+	      echo "$progname: warning: \`$lib' contains no -rpath information" 1>&2
+	    elif test -f "$libfile"; then :
+	    else
+	      echo "$progname: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  if test "$hardcode_direct" != no && test "$hardcode_minus_L" != no && test "$hardcode_shlibpath_var" != no; then
+	    if test "$finalize" = no; then
+	      echo "$progname: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
+	    else
+	      echo "$progname: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
+	      $show "$finalize_command"
+	      if $run $finalize_command; then :
+	      else
+		echo "$progname: error: relink \`$file' with the above command before installing it" 1>&2
+		continue
+	      fi
+	      file="$objdir/$file"T
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    dir=`echo "$file" | sed 's%/[^/]*$%%'`
+	    if test "$file" = "$dir"; then
+	      file="$objdir/$file"
+	    else
+	      file="$dir/$objdir/`echo "$file" | sed 's%^.*/%%'`"
+	    fi
+	  fi
+	fi
 
-        $show "$install_prog$stripme $file $dest"
-        $run eval "$install_prog\$stripme \$file \$dest" || exit $?
-        ;;
+	$show "$install_prog$stripme $file $dest"
+	$run $install_prog$stripme $file $dest || exit $?
+	;;
       esac
     done
 
     for file in $staticlibs; do
-      name=`$echo "$file" | sed 's%^.*/%%'`
+      name=`echo "$file" | sed 's%^.*/%%'`
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
 
       $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
+      $run $install_prog $file $oldlib || exit $?
 
       # Support stripping libraries.
       if test -n "$stripme"; then
-        if test -n "$old_striplib"; then
-          $show "$old_striplib $oldlib"
-          $run $old_striplib $oldlib || exit $?
-        else
-          $echo "$progname: warning: no static library stripping program" 1>&2
-        fi
+	if test -n "$old_striplib"; then
+	  $show "$old_striplib $oldlib"
+	  $run $old_striplib $oldlib || exit $?
+	else
+	  echo "$progname: warning: no static library stripping program" 1>&2
+	fi
       fi
 
       # Do each command in the postinstall commands.
-      cmds=`eval \\$echo \"$old_postinstall_cmds\"`
+      cmds=`eval echo \"$old_postinstall_cmds\"`
       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
       for cmd in $cmds; do
         IFS="$save_ifs"
         $show "$cmd"
-        $run eval "$cmd" || exit $?
+        eval "$run $cmd" || exit $?
       done
       IFS="$save_ifs"
     done
 
     if test -n "$future_libdirs"; then
-      $echo "$progname: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+      echo "$progname: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
     fi
 
     if test -n "$current_libdirs"; then
@@ -1852,6 +1449,48 @@
     exit 0
     ;;
 
+  # libtool dlname mode
+  dlname)
+    progname="$progname: dlname"
+    ltlibs="$nonopt"
+    for lib
+    do
+      ltlibs="$ltlibs $lib"
+    done
+
+    # Now check to make sure each one is a valid libtool library.
+    status=0
+    for lib in $ltlibs; do
+      dlname=
+      libdir=
+
+      # Check to see that this really is a libtool archive.
+      if egrep "^# Generated by $PROGRAM" $arg >/dev/null 2>&1; then :
+      else
+        echo "$progname: \`$arg' is not a valid libtool archive" 1>&2
+	status=1
+	continue
+      fi
+
+      # If there is no directory component, then add one.
+      case "$arg" in
+      */*) . $arg ;;
+      *) . ./$arg ;;
+      esac
+
+      if test -z "$libdir"; then
+        echo "$progname: \`$arg' contains no -rpath information" 1>&2
+        status=1
+      elif test -n "$dlname"; then
+	echo "$libdir/$dlname"
+      else
+        echo "$progname: \`$arg' was not linked with \`-export-dynamic'" 1>&2
+        status=1
+      fi
+    done
+    exit $status
+    ;;
+
   # libtool finish mode
   finish)
     progname="$progname: finish"
@@ -1860,160 +1499,30 @@
     if test -n "$finish_cmds" && test -n "$libdirs"; then
       for dir
       do
-        libdirs="$libdirs $dir"
+	libdirs="$libdirs $dir"
       done
 
       for libdir in $libdirs; do
-        # Do each command in the postinstall commands.
-        cmds=`eval \\$echo \"$finish_cmds\"`
-        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-        for cmd in $cmds; do
-          IFS="$save_ifs"
-          $show "$cmd"
-          $run eval "$cmd"
-        done
-        IFS="$save_ifs"
+	# Do each command in the postinstall commands.
+	cmds=`eval echo \"$finish_cmds\"`
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  eval "$run $cmd"
+	done
+	IFS="$save_ifs"
       done
     fi
 
-    $echo "To link against installed libraries in LIBDIR, users may have to:"
+    echo "To link against installed libraries in LIBDIR, users may have to:"
     if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to their \`$shlibpath_var' environment variable"
+      echo "   - add LIBDIR to their \`$shlibpath_var' environment variable"
     fi
-    $echo "   - use the \`-LLIBDIR' linker flag"
+    echo "   - use the \`-LLIBDIR' linker flag"
     exit 0
     ;;
 
-  # libtool execute mode
-  execute)
-    progname="$progname: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$progname: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test -f "$file"; then :
-      else
-	$echo "$progname: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case "$file" in
-      *.la)
-        # Check to see that this really is a libtool archive.
-        if egrep "^# Generated by ltmain.sh" $file >/dev/null 2>&1; then :
-        else
-          $echo "$progname: \`$lib' is not a valid libtool archive" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-        fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-        # If there is no directory component, then add one.
-	case "$file" in
-	*/*) . $file ;;
-        *) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$progname: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "$file" | sed 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$progname: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "$file" | sed 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$progname: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-        continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case "$file" in
-      -*) ;;
-      *)
-	if egrep '^# Generated by ltmain.sh' $file >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case "$file" in
-	  */*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-        ;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "$file" | sed "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      # Export the shlibpath_var.
-      eval "export $shlibpath_var"
-
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$progname: cannot exec \$cmd$args"
-      exit 1
-    else
-      # Display what would be done.
-      eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-      $echo "export $shlibpath_var"
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
   # libtool uninstall mode
   uninstall)
     progname="$progname: uninstall"
@@ -2029,42 +1538,35 @@
     done
 
     if test -z "$rm"; then
-      $echo "$progname: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
+      echo "$progname: you must specify an RM program" 1>&2
+      echo "$help" 1>&2
       exit 1
     fi
 
     for file in $files; do
-      dir=`$echo "$file" | sed -e 's%/[^/]*$%%'`
-      test "X$dir" = "X$file" && dir=.
-      name=`$echo "$file" | sed -e 's%^.*/%%'`
+      dir=`echo "$file" | sed -e 's%/[^/]*$%%'`
+      test "$dir" = "$file" && dir=.
+      name=`echo "$file" | sed -e 's%^.*/%%'`
 
       rmfiles="$file"
 
       case "$name" in
       *.la)
-        # Possibly a libtool archive, so verify it.
-        if egrep "^# Generated by ltmain.sh" $file >/dev/null 2>&1; then
-          . $dir/$name
-
-          # Delete the libtool libraries and symlinks.
-          for n in $library_names; do
-            rmfiles="$rmfiles $dir/$n"
-            test "X$n" = "X$dlname" && dlname=
-          done
-          test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
-          test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
-
-          # FIXME: should reinstall the best remaining shared library.
-        fi
-        ;;
+	# Possibly a libtool archive, so verify it.
+	if egrep "^# Generated by $PROGRAM" $file >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $dir/$n"
+	    test "X$n" = "X$dlname" && dlname=
+	  done
+	  test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
+	  test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
 
-      *.lo)
-        if test "$build_old_libs" = yes; then
-          oldobj=`$echo "$name" | sed 's/\.lo$/\.o/'`
-          rmfiles="$rmfiles $dir/$oldobj"
-        fi
-        ;;
+	  # FIXME: should reinstall the best remaining shared library.
+	fi
+	;;
       esac
 
       $show "$rm $rmfiles"
@@ -2073,21 +1575,21 @@
     exit 0
     ;;
 
-  "")
-    $echo "$progname: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
+  NONE)
+    echo "$progname: you must specify a MODE" 1>&2
+    echo "$generic_help" 1>&2
     exit 1
     ;;
   esac
 
-  $echo "$progname: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
+  echo "$progname: invalid operation mode \`$mode'" 1>&2
+  echo "$generic_help" 1>&2
   exit 1
 fi # test -z "$show_help"
 
 # We need to display help for each of the modes.
 case "$mode" in
-"") cat <<EOF
+NONE) cat <<EOF
 Usage: $progname [OPTION]... [MODE-ARG]...
 
 Provide generalized library-building support services.
@@ -2097,14 +1599,12 @@
     --finish          same as \`--mode=finish'
     --help            display this help message and exit
     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
     --version         print version information
 
 MODE must be one of the following:
 
       compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
+      dlname          print filenames to use to \`dlopen' libtool libraries
       finish          complete the installation of libtool libraries
       install         install libraries or executables
       link            create a library or an executable
@@ -2130,24 +1630,16 @@
 EOF
   ;;
 
-execute)
+dlname)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
+Usage: $progname [OPTION]... --mode=dlname LTLIBRARY [LTLIBRARY]...
 
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
+Print filenames to use to \`dlopen' libtool libraries.
 
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
+Each LTLIBRARY is the name of a dynamically loadable libtool library (one that
+was linked using the \`-export-dynamic' option).
 
-Then, COMMAND is executed, with ARGS as arguments.
+The names to use are printed to standard output, one per line.
 EOF
   ;;
 
@@ -2190,18 +1682,16 @@
 
 The following components of LINK-COMMAND are treated specially:
 
-  -all-static       do not do any dynamic linking at all
-  -allow-undefined  allow a libtool library to reference undefined symbols
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to dld_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-dynamic   allow the output file to be loaded with dlopen(3)
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -no-whole-archive turn off \`-whole-archive'
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking or shared library creation
   -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
+		    specify library version info [each variable defaults to 0]
+  -whole-archive    use all members from subsequent \`.a' files
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -2213,7 +1703,8 @@
 library objects (\`.lo' files) may be specified, and \`-rpath' is required.
 
 If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar'
-and \`ranlib'.
+and \`ranlib'.  If only libtool objects are specified, then the output file
+may be used in the creation of other libtool archives.
 
 If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is
 created, otherwise an executable program is created.
@@ -2236,14 +1727,18 @@
   ;;
 
 *)
-  $echo "$progname: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
+  echo "$progname: invalid operation mode \`$mode'" 1>&2
+  echo "$help" 1>&2
   exit 1
   ;;
 esac
 
-$echo
-$echo "Try \`$progname --help' for more information about other modes."
+case "$mode" in
+archive|compile)
+  echo
+  echo "Try \`$progname --help' for more information about other modes."
+  ;;
+esac
 
 exit 0
 
diff -uNr gnome-0.6/guile-gtk/mkinstalldirs gnome-0.7/guile-gtk/mkinstalldirs
--- gnome-0.6/guile-gtk/mkinstalldirs	Sat Sep 20 09:29:30 1997
+++ gnome-0.7/guile-gtk/mkinstalldirs	Thu Oct  2 23:24:24 1997
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1.1.1 1997/09/20 14:29:30 mvo Exp $
+# $Id: mkinstalldirs,v 1.2 1997/10/03 04:35:56 nobody Exp $
 
 errstatus=0
 
diff -uNr gnome-0.6/lib/Makefile.am gnome-0.7/lib/Makefile.am
--- gnome-0.6/lib/Makefile.am	Wed Sep 24 18:23:27 1997
+++ gnome-0.7/lib/Makefile.am	Wed Oct  1 18:26:02 1997
@@ -1,2 +1,2 @@
-SUBDIRS = pixmaps
+SUBDIRS = pixmaps desktop-links
 
diff -uNr gnome-0.6/lib/Makefile.in gnome-0.7/lib/Makefile.in
--- gnome-0.6/lib/Makefile.in	Tue Sep 30 00:39:38 1997
+++ gnome-0.7/lib/Makefile.in	Fri Oct  3 01:04:27 1997
@@ -83,7 +83,7 @@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-SUBDIRS = pixmaps
+SUBDIRS = pixmaps desktop-links
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -uNr gnome-0.6/lib/desktop-links/Emacs.desktop gnome-0.7/lib/desktop-links/Emacs.desktop
--- gnome-0.6/lib/desktop-links/Emacs.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/Emacs.desktop	Wed Oct  1 16:44:12 1997
@@ -0,0 +1,7 @@
+[Desktop Entry]
+TryExec=emacs
+Exec=emacs
+Icon=
+Info=Emacs text editor
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/lib/desktop-links/GIMP.desktop gnome-0.7/lib/desktop-links/GIMP.desktop
--- gnome-0.6/lib/desktop-links/GIMP.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/GIMP.desktop	Wed Oct  1 20:42:53 1997
@@ -0,0 +1,7 @@
+[Desktop Entry]
+TryExec=gimp
+Exec=gimp
+Icon=gnome-gimp.xpm
+Info=GNU Image Manipulation Program
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/lib/desktop-links/Makefile.am gnome-0.7/lib/desktop-links/Makefile.am
--- gnome-0.6/lib/desktop-links/Makefile.am	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/Makefile.am	Wed Oct  1 20:44:09 1997
@@ -0,0 +1,35 @@
+appsdir = $(datadir)/apps
+
+ApplicationDir = $(appsdir)/Applications
+GraphicsDir    = $(appsdir)/Graphics
+SystemDir      = $(appsdir)/System
+UtilitiesDir   = $(appsdir)/Utilities
+AudioDir       = $(appsdir)/Audio
+NetworkDir     = $(appsdir)/Network
+
+APPLICATION_LINKS = 	\
+	Emacs.desktop	\
+	Netscape.desktop	
+
+GRAPHICS_LINKS    = 	\
+	GIMP.desktop
+	
+UTILITIES_LINKS   = 	\
+	UNIX.desktop	\
+	UNIX-regular.desktop
+
+ALL_LINKS = $(APPLICATION_LINKS) $(GRAPHICS_LINKS) $(UTILITIES_LINKS)
+
+install-data-local: 
+	-mkdir $(appsdir)
+	-mkdir $(ApplicationDir)
+	-mkdir $(GraphicsDir)
+	-mkdir $(SystemDir)
+	-mkdir $(AudioDir)
+	-mkdir $(UtilitiesDir)
+	-mkdir $(NetworkDir)
+	for i in $(APPLICATION_LINKS); do cp $$i $(ApplicationDir); done
+	for i in $(GRAPHICS_LINKS); do cp $$i $(GraphicsDir); done
+	for i in $(UTILITIES_LINKS); do cp $$i $(UtilitiesDir); done
+
+EXTRA_DIST = $(ALL_LINKS)
diff -uNr gnome-0.6/lib/desktop-links/Makefile.in gnome-0.7/lib/desktop-links/Makefile.in
--- gnome-0.6/lib/desktop-links/Makefile.in	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/Makefile.in	Fri Oct  3 01:04:29 1997
@@ -0,0 +1,213 @@
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+host_alias = @host_alias@
+host_triplet = @host@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+DATADIRNAME = @DATADIRNAME@
+ELCFILES = @ELCFILES@
+EMACS = @EMACS@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLSUB = @INTLSUB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LIBTOOL = @LIBTOOL@
+LISPDIR = @LISPDIR@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MSGFMT = @MSGFMT@
+NM = @NM@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+
+appsdir = $(datadir)/apps
+
+ApplicationDir = $(appsdir)/Applications
+GraphicsDir    = $(appsdir)/Graphics
+SystemDir      = $(appsdir)/System
+UtilitiesDir   = $(appsdir)/Utilities
+AudioDir       = $(appsdir)/Audio
+NetworkDir     = $(appsdir)/Network
+
+APPLICATION_LINKS = 	\
+	Emacs.desktop	\
+	Netscape.desktop	
+
+GRAPHICS_LINKS    = 	\
+	GIMP.desktop
+
+UTILITIES_LINKS   = 	\
+	UNIX.desktop	\
+	UNIX-regular.desktop
+
+ALL_LINKS = $(APPLICATION_LINKS) $(GRAPHICS_LINKS) $(UTILITIES_LINKS)
+
+EXTRA_DIST = $(ALL_LINKS)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+default: all
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/desktop-links/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib/desktop-links
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	@$(NORMAL_INSTALL)
+
+install-data: install-data-local
+	@$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: 
+
+all: Makefile
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-generic
+
+clean:  clean-generic mostlyclean
+
+distclean:  distclean-generic clean
+	rm -f config.status
+	rm -f libtool
+
+maintainer-clean:  maintainer-clean-generic distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default tags distdir info dvi installcheck install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+install-data-local: 
+	-mkdir $(appsdir)
+	-mkdir $(ApplicationDir)
+	-mkdir $(GraphicsDir)
+	-mkdir $(SystemDir)
+	-mkdir $(AudioDir)
+	-mkdir $(UtilitiesDir)
+	-mkdir $(NetworkDir)
+	for i in $(APPLICATION_LINKS); do cp $$i $(ApplicationDir); done
+	for i in $(GRAPHICS_LINKS); do cp $$i $(GraphicsDir); done
+	for i in $(UTILITIES_LINKS); do cp $$i $(UtilitiesDir); done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr gnome-0.6/lib/desktop-links/Netscape.desktop gnome-0.7/lib/desktop-links/Netscape.desktop
--- gnome-0.6/lib/desktop-links/Netscape.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/Netscape.desktop	Wed Oct  1 16:44:27 1997
@@ -0,0 +1,7 @@
+[Desktop Entry]
+TryExec=netscape
+Exec=netscape
+Icon=netscape3.xpm
+Info=Netscape browser
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/lib/desktop-links/UNIX-regular.desktop gnome-0.7/lib/desktop-links/UNIX-regular.desktop
--- gnome-0.6/lib/desktop-links/UNIX-regular.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/UNIX-regular.desktop	Wed Oct  1 20:48:36 1997
@@ -0,0 +1,7 @@
+[Desktop Entry]
+TryExec=xterm
+Exec=xterm
+Icon=UNIX.xpm
+Info=Regular XTerm
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/lib/desktop-links/UNIX.desktop gnome-0.7/lib/desktop-links/UNIX.desktop
--- gnome-0.6/lib/desktop-links/UNIX.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/desktop-links/UNIX.desktop	Wed Oct  1 20:48:44 1997
@@ -0,0 +1,7 @@
+[Desktop Entry]
+TryExec=nxterm
+Exec=nxterm
+Icon=UNIX.xpm
+Info=Color XTerm
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/lib/pixmaps/Makefile.am gnome-0.7/lib/pixmaps/Makefile.am
--- gnome-0.6/lib/pixmaps/Makefile.am	Wed Sep 24 18:23:29 1997
+++ gnome-0.7/lib/pixmaps/Makefile.am	Thu Oct  2 23:59:36 1997
@@ -1,6 +1,19 @@
 pixmapdir = $(datadir)/pixmaps
 
-BITMAPS     = monitor.xpm
+BITMAPS     = \
+	arrowup.xpm				\
+	gnome-cromagnon-small.xpm		\
+	gnome-cromagnon-transparent.xpm		\
+	gnome-cromagnon.xpm			\
+	gnome-gimp-small.xpm			\
+	gnome-gimp-transparent.xpm		\
+	gnome-gimp.xpm				\
+	monitor.xpm				\
+	panel-menu-main.xpm			\
+	UNIX-small.xpm				\
+	gnome-network-small.xpm			\
+	netscape3-small.xpm
+		
 
 pixmap_DATA = $(BITMAPS)
 
diff -uNr gnome-0.6/lib/pixmaps/Makefile.in gnome-0.7/lib/pixmaps/Makefile.in
--- gnome-0.6/lib/pixmaps/Makefile.in	Tue Sep 30 00:39:40 1997
+++ gnome-0.7/lib/pixmaps/Makefile.in	Fri Oct  3 01:04:28 1997
@@ -85,7 +85,19 @@
 
 pixmapdir = $(datadir)/pixmaps
 
-BITMAPS     = monitor.xpm
+BITMAPS     = \
+	arrowup.xpm				\
+	gnome-cromagnon-small.xpm		\
+	gnome-cromagnon-transparent.xpm		\
+	gnome-cromagnon.xpm			\
+	gnome-gimp-small.xpm			\
+	gnome-gimp-transparent.xpm		\
+	gnome-gimp.xpm				\
+	monitor.xpm				\
+	panel-menu-main.xpm			\
+	UNIX-small.xpm				\
+	gnome-network-small.xpm			\
+	netscape3-small.xpm
 
 pixmap_DATA = $(BITMAPS)
 
diff -uNr gnome-0.6/lib/pixmaps/UNIX-small.xpm gnome-0.7/lib/pixmaps/UNIX-small.xpm
--- gnome-0.6/lib/pixmaps/UNIX-small.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/UNIX-small.xpm	Wed Oct  1 20:48:07 1997
@@ -0,0 +1,78 @@
+/* XPM */
+static char * UNIX_small_xpm[] = {
+"16 16 59 1",
+" 	c None",
+".	c #618561856185",
+"X	c #69A66DB669A6",
+"o	c #69A669A669A6",
+"O	c #B6DAAEBAB6DA",
+"+	c #861786178617",
+"@	c #965892489658",
+"#	c #79E779E779E7",
+"$	c #618565956185",
+"%	c #514455555144",
+"&	c #38E338E338E3",
+"*	c #BEFBBAEABEFB",
+"=	c #DF7DDB6CDF7D",
+"-	c #CF3CCB2BCF3C",
+";	c #492449244924",
+":	c #49244D344924",
+">	c #D75CD75CD75C",
+",	c #EFBEEFBEEFBE",
+"<	c #71C671C671C6",
+"1	c #CF3CCF3CCF3C",
+"2	c #492471C64924",
+"3	c #49245D754924",
+"4	c #E79DE38DE79D",
+"5	c #DF7DDF7DDF7D",
+"6	c #4924AAAA4924",
+"7	c #492486174924",
+"8	c #861782078617",
+"9	c #E79DE79DE79D",
+"0	c #D75CD34CD75C",
+"q	c #8E388A288E38",
+"w	c #AEBAAEBAAEBA",
+"e	c #596559655965",
+"r	c #C71BC71BC71B",
+"t	c #EFBEEBADEFBE",
+"y	c #9E799E799E79",
+"u	c #DF7DD75CDF7D",
+"i	c #38E33CF338E3",
+"p	c #B6DAB6DAB6DA",
+"a	c #492496584924",
+"s	c #8E388E388E38",
+"d	c #AEBAAAAAAEBA",
+"f	c #965896589658",
+"g	c #79E77DF779E7",
+"h	c #71C675D671C6",
+"j	c #B6DAB2CAB6DA",
+"k	c #30C230C230C2",
+"l	c #59655D755965",
+"z	c #9E799A699E79",
+"x	c #A699A699A699",
+"c	c #28A22CB228A2",
+"v	c #186118611861",
+"b	c #208120812081",
+"n	c #28A228A228A2",
+"m	c #410345144103",
+"M	c #BEFBBEFBBEFB",
+"N	c #C71BC30BC71B",
+"B	c #410341034103",
+"V	c #514451445144",
+"C	c #18611C711861",
+"                ",
+"      .Xoo      ",
+"  O+@#$%&&*=    ",
+"  -;:::::%>,<   ",
+"  1:223::o4=#   ",
+" :5:67762890qw  ",
+" er373:73qtwyu  ",
+" ip26a772s9@dy  ",
+" 8d3723::f>gy$  ",
+" hr<XX<$Xjr8yk  ",
+" l<gqzyy@zxh;&  ",
+"  :8#o.cvbni;   ",
+"  mp1Mpdfx0NsB  ",
+"   %#h.g@pjlV   ",
+"       nCm      ",
+"                "};
diff -uNr gnome-0.6/lib/pixmaps/arrowup.xpm gnome-0.7/lib/pixmaps/arrowup.xpm
--- gnome-0.6/lib/pixmaps/arrowup.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/arrowup.xpm	Wed Oct  1 18:22:28 1997
@@ -0,0 +1,17 @@
+/* XPM */
+static char * arrowup_xpm[] = {
+"9 9 5 1",
+" 	c None",
+".	c #FFFFFFFFFFFF",
+"X	c #D75CD75CD75C",
+"o	c #000000000000",
+"O	c #965896589658",
+"    .    ",
+"   .Xo   ",
+"   .Xo   ",
+"  .XXOo  ",
+"  .XXOo  ",
+" .XXXXOo ",
+" .XXXXOo ",
+".XOOOOOOo",
+".XoooooOo"};
diff -uNr gnome-0.6/lib/pixmaps/gnome-cromagnon-small.xpm gnome-0.7/lib/pixmaps/gnome-cromagnon-small.xpm
--- gnome-0.6/lib/pixmaps/gnome-cromagnon-small.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/gnome-cromagnon-small.xpm	Wed Oct  1 18:10:43 1997
@@ -0,0 +1,121 @@
+/* XPM */
+static char * gnome_cromagnon_small_xpm[] = {
+"16 16 102 2",
+"  	c None",
+". 	c #514449244103",
+"X 	c #9658820771C6",
+"o 	c #8E387DF769A6",
+"O 	c #9E79861779E7",
+"+ 	c #96587DF769A6",
+"@ 	c #96587DF771C6",
+"# 	c #A6998A2879E7",
+"$ 	c #A6998E3879E7",
+"% 	c #8E3875D669A6",
+"& 	c #38E32CB228A2",
+"* 	c #79E76DB66185",
+"= 	c #71C665955965",
+"- 	c #5144410338E3",
+"; 	c #492449244924",
+": 	c #38E338E338E3",
+"> 	c #861786178617",
+", 	c #8E3879E769A6",
+"< 	c #69A65D755144",
+"1 	c #492438E330C2",
+"2 	c #30C230C230C2",
+"3 	c #492449244103",
+"4 	c #596555554924",
+"5 	c #9E79820771C6",
+"6 	c #96588E388E38",
+"7 	c #861771C66185",
+"8 	c #69A655554924",
+"9 	c #4103410338E3",
+"0 	c #71C671C669A6",
+"q 	c #965892488E38",
+"w 	c #A699A2899E79",
+"e 	c #B6DAA6999E79",
+"r 	c #8E386DB66185",
+"t 	c #51443CF338E3",
+"y 	c #71C661855965",
+"u 	c #5965451438E3",
+"i 	c #30C230C228A2",
+"p 	c #8E388A288617",
+"a 	c #CF3CCF3CCF3C",
+"s 	c #C71BBAEAB6DA",
+"d 	c #9E7971C671C6",
+"f 	c #BEFBB2CAAEBA",
+"g 	c #CF3CC71BBEFB",
+"h 	c #8E3871C66185",
+"j 	c #861769A65965",
+"k 	c #61855D755965",
+"l 	c #D75CCF3CCF3C",
+"z 	c #C71BC30BBEFB",
+"x 	c #BEFBBAEAB6DA",
+"c 	c #B6DAAEBAAEBA",
+"v 	c #CF3CCF3CC71B",
+"b 	c #BEFBAEBAA699",
+"n 	c #861765955965",
+"m 	c #79E75D755144",
+"M 	c #71C661855144",
+"N 	c #8617820779E7",
+"B 	c #BEFBBEFBB6DA",
+"V 	c #BEFBB6DAAEBA",
+"C 	c #8E3865956185",
+"Z 	c #D75CD34CCF3C",
+"A 	c #D75CCF3CC71B",
+"S 	c #71C655554924",
+"D 	c #5965410338E3",
+"F 	c #618549244103",
+"G 	c #618555554924",
+"H 	c #596549244103",
+"J 	c #C71BBEFBB6DA",
+"K 	c #965886178617",
+"L 	c #618551445144",
+"P 	c #AEBAA699A699",
+"I 	c #DF7DD75CCF3C",
+"U 	c #6185451438E3",
+"Y 	c #410334D330C2",
+"T 	c #71C65D755144",
+"R 	c #51443CF330C2",
+"E 	c #965875D671C6",
+"W 	c #E79DDF7DD75C",
+"Q 	c #514438E330C2",
+"! 	c #492434D328A2",
+"~ 	c #410334D328A2",
+"^ 	c #BEFBAEBAAEBA",
+"/ 	c #E79DE38DDF7D",
+"( 	c #9E798E388617",
+") 	c #41032CB228A2",
+"_ 	c #30C220811861",
+"` 	c #D75CD34CC71B",
+"' 	c #DF7DDB6CCF3C",
+"] 	c #E79DE38DD75C",
+"[ 	c #38E320811861",
+"{ 	c #618551444924",
+"} 	c #596545144103",
+"| 	c #71C66DB66185",
+" .	c #618555555144",
+"..	c #28A21C711861",
+"X.	c #208114511040",
+"o.	c #61854D344103",
+"O.	c #965879E769A6",
+"+.	c #8E387DF771C6",
+"@.	c #8E3879E771C6",
+"#.	c #49243CF330C2",
+"$.	c #208118611861",
+"%.	c #10400C300820",
+"  . X o                         ",
+"  X O +                         ",
+"@ # $ % &                       ",
+"  X * = -       ; :     >       ",
+"  , , < 1     2 3 ; 4 5 6       ",
+"  7 7 8     9 0 q 6 w e 5 r t   ",
+"  % y u   i p a s d f g , h j   ",
+"  % < -   k l z x d c v b n m u ",
+"  M 8     N z B V C f Z A S D F ",
+"  G H     6 J J K L P I I U t F ",
+"Y T R     q J J E f x W g Q R ! ",
+"~ 8 t     N z J ^ x W / ( ) ) _ ",
+"  Y 1       x A ` ' ] Z 1 [ [   ",
+"{ } &       | g ' W A  .....X.  ",
+"o.t         T O.+.@.T #.& $.%.  ",
+"1 R                             "};
diff -uNr gnome-0.6/lib/pixmaps/gnome-cromagnon-transparent.xpm gnome-0.7/lib/pixmaps/gnome-cromagnon-transparent.xpm
--- gnome-0.6/lib/pixmaps/gnome-cromagnon-transparent.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/gnome-cromagnon-transparent.xpm	Wed Oct  1 18:10:46 1997
@@ -0,0 +1,315 @@
+/* XPM */
+static char * gnome_cromagnon_transparent_xpm[] = {
+"48 48 264 2",
+"  	c None",
+". 	c #9658861771C6",
+"X 	c #861775D669A6",
+"o 	c #79E76DB66185",
+"O 	c #861771C66185",
+"+ 	c #9E79861779E7",
+"@ 	c #9658820771C6",
+"# 	c #A69992488617",
+"$ 	c #861779E769A6",
+"% 	c #8E3875D669A6",
+"& 	c #B6DA9E798E38",
+"* 	c #C71BAEBA9E79",
+"= 	c #9E798A2879E7",
+"- 	c #AEBA96588617",
+"; 	c #86176DB66185",
+": 	c #8E3879E769A6",
+"> 	c #A6998A2879E7",
+", 	c #BEFBA2899658",
+"< 	c #9E798E3879E7",
+"1 	c #96587DF771C6",
+"2 	c #71C661855965",
+"3 	c #A6998E3879E7",
+"4 	c #AEBA92488617",
+"5 	c #B6DAA2899658",
+"6 	c #AEBA9A698617",
+"7 	c #AEBA9A698E38",
+"8 	c #9E79820771C6",
+"9 	c #104010401040",
+"0 	c #5144451438E3",
+"q 	c #79E769A65965",
+"w 	c #208120811861",
+"e 	c #69A655554924",
+"r 	c #30C234D330C2",
+"t 	c #410341034103",
+"y 	c #28A22CB228A2",
+"u 	c #38E33CF338E3",
+"i 	c #596555555144",
+"p 	c #86177DF779E7",
+"a 	c #861782078617",
+"s 	c #71C675D671C6",
+"d 	c #861786178617",
+"f 	c #596551444924",
+"g 	c #41033CF338E3",
+"h 	c #71C665955965",
+"j 	c #69A659655144",
+"k 	c #410334D330C2",
+"l 	c #79E765955965",
+"z 	c #38E338E338E3",
+"x 	c #410345144103",
+"c 	c #514455555144",
+"v 	c #492445144103",
+"b 	c #618561855965",
+"n 	c #71C671C669A6",
+"m 	c #79E775D671C6",
+"M 	c #8E388E388E38",
+"N 	c #8E3886178617",
+"B 	c #965892488E38",
+"V 	c #71C659655144",
+"C 	c #51444D344924",
+"Z 	c #514451445144",
+"A 	c #79E77DF779E7",
+"S 	c #BEFBA6999658",
+"D 	c #861769A65965",
+"F 	c #79E761855144",
+"G 	c #61854D344103",
+"H 	c #492449244924",
+"J 	c #49244D344924",
+"K 	c #59655D755965",
+"L 	c #965896589658",
+"P 	c #9E799A699E79",
+"I 	c #596549244103",
+"U 	c #492438E330C2",
+"Y 	c #514451444924",
+"T 	c #79E771C669A6",
+"R 	c #965875D669A6",
+"E 	c #C71B9E798E38",
+"W 	c #BEFB96588617",
+"Q 	c #8617820779E7",
+"! 	c #861771C669A6",
+"~ 	c #69A659654924",
+"^ 	c #79E75D755144",
+"/ 	c #618565955965",
+"( 	c #E79DB2CAA699",
+") 	c #AEBA8A2879E7",
+"_ 	c #A699A699A699",
+"` 	c #79E761855965",
+"' 	c #71C65D755144",
+"] 	c #492449244103",
+"[ 	c #69A66DB669A6",
+"{ 	c #79E77DF771C6",
+"} 	c #8617861779E7",
+"| 	c #C71B9A698E38",
+" .	c #B6DA96588E38",
+"..	c #A699861779E7",
+"X.	c #A6997DF771C6",
+"o.	c #965871C669A6",
+"O.	c #5144410338E3",
+"+.	c #4103410338E3",
+"@.	c #38E338E330C2",
+"#.	c #596559655965",
+"$.	c #8E388A288617",
+"%.	c #AEBAAAAAA699",
+"&.	c #B6DAB6DAB6DA",
+"*.	c #BEFBB6DAB6DA",
+"=.	c #BEFBBAEAB6DA",
+"-.	c #BEFBBEFBB6DA",
+";.	c #BEFB9E798E38",
+":.	c #861765955965",
+">.	c #A699820771C6",
+",.	c #5965451438E3",
+"<.	c #AEBAAEBAAEBA",
+"1.	c #D75CD34CCF3C",
+"2.	c #DF7DDB6CD75C",
+"3.	c #D75CCF3CCF3C",
+"4.	c #BEFBAAAAA699",
+"5.	c #861745144924",
+"6.	c #AEBA9A699658",
+"7.	c #C71BBEFBB6DA",
+"8.	c #C71BC30BBEFB",
+"9.	c #CF3CC71BBEFB",
+"0.	c #8E386DB66185",
+"q.	c #965871C66185",
+"w.	c #9E7979E769A6",
+"e.	c #965879E769A6",
+"r.	c #AEBAAAAAAEBA",
+"t.	c #E79DE79DE79D",
+"y.	c #C71BBEFBBEFB",
+"u.	c #79E734D338E3",
+"i.	c #AEBA96589658",
+"p.	c #9E7996589658",
+"a.	c #C71BC71BBEFB",
+"s.	c #CF3CCB2BC71B",
+"d.	c #9E7992488617",
+"f.	c #410334D328A2",
+"g.	c #9E7975D669A6",
+"h.	c #96587DF769A6",
+"j.	c #618551444103",
+"k.	c #B6DAB2CAAEBA",
+"l.	c #BEFBBEFBBEFB",
+"z.	c #D75CD75CD75C",
+"x.	c #79E730C230C2",
+"c.	c #9E7992489658",
+"v.	c #CF3CCF3CC71B",
+"b.	c #69A651444924",
+"n.	c #618549244103",
+"m.	c #8E3869A65965",
+"M.	c #CF3CC71BC71B",
+"N.	c #A6999E799E79",
+"B.	c #D75CCF3CC71B",
+"V.	c #D75CD34CC71B",
+"C.	c #9658820779E7",
+"Z.	c #71C655554924",
+"A.	c #5965410338E3",
+"S.	c #596559655144",
+"D.	c #DF7DDF7DDF7D",
+"F.	c #E79DE38DDF7D",
+"G.	c #79E72CB230C2",
+"H.	c #AEBA9E799658",
+"J.	c #B6DAA2899E79",
+"K.	c #618551444924",
+"L.	c #69A669A66185",
+"P.	c #C71BC30BB6DA",
+"I.	c #71C62CB230C2",
+"U.	c #B6DA9E799E79",
+"Y.	c #AEBAA2899E79",
+"T.	c #DF7DD75CCF3C",
+"R.	c #C71BBAEAB6DA",
+"E.	c #51443CF330C2",
+"W.	c #28A220811861",
+"Q.	c #410330C228A2",
+"!.	c #71C675D669A6",
+"~.	c #71C634D338E3",
+"^.	c #8E3871C671C6",
+"/.	c #DF7DDB6CCF3C",
+"(.	c #69A64D344103",
+").	c #861761855144",
+"_.	c #79E779E771C6",
+"`.	c #AEBAA6999E79",
+"'.	c #61852CB230C2",
+"].	c #69A651445144",
+"[.	c #BEFBB6DAAEBA",
+"{.	c #618545144103",
+"}.	c #514438E330C2",
+"|.	c #79E759655144",
+" X	c #38E32CB228A2",
+".X	c #30C21C712081",
+"XX	c #A699A2899E79",
+"oX	c #E79DDF7DD75C",
+"OX	c #71C661855144",
+"+X	c #69A638E338E3",
+"@X	c #61853CF34103",
+"#X	c #69A649244103",
+"$X	c #492434D330C2",
+"%X	c #6185451438E3",
+"&X	c #71C66DB669A6",
+"*X	c #861755555965",
+"=X	c #69A641034924",
+"-X	c #9E799A699658",
+";X	c #DF7DDF7DD75C",
+":X	c #E79DE38DD75C",
+">X	c #CF3CC30BB6DA",
+",X	c #41032CB228A2",
+"<X	c #49243CF330C2",
+"1X	c #618534D338E3",
+"2X	c #BEFBB2CAAEBA",
+"3X	c #B6DAAEBAAEBA",
+"4X	c #AEBAA699A699",
+"5X	c #59653CF330C2",
+"6X	c #B6DAB6DAAEBA",
+"7X	c #CF3CCB2BBEFB",
+"8X	c #861761856185",
+"9X	c #96588A288E38",
+"0X	c #EFBEE79DDF7D",
+"qX	c #86176DB669A6",
+"wX	c #514434D330C2",
+"eX	c #492434D328A2",
+"rX	c #492430C228A2",
+"tX	c #B6DAAAAAA699",
+"yX	c #410328A22081",
+"uX	c #41032CB22081",
+"iX	c #38E328A22081",
+"pX	c #49242CB228A2",
+"aX	c #28A21C711861",
+"sX	c #38E324922081",
+"dX	c #A6999A699E79",
+"fX	c #EFBEEBADDF7D",
+"gX	c #96588A288617",
+"hX	c #30C220811861",
+"jX	c #38E324921861",
+"kX	c #28A224922081",
+"lX	c #186114511040",
+"zX	c #30C224922081",
+"xX	c #49242CB22081",
+"cX	c #30C21C711861",
+"vX	c #38E320811861",
+"bX	c #410324922081",
+"nX	c #965896588E38",
+"mX	c #96588E388617",
+"MX	c #618555554924",
+"NX	c #208114511040",
+"BX	c #28A218611861",
+"VX	c #A6999E799658",
+"CX	c #D75CD75CCF3C",
+"ZX	c #28A218611040",
+"AX	c #28A214511040",
+"SX	c #30C218611040",
+"DX	c #86177DF771C6",
+"FX	c #E79DE79DDF7D",
+"GX	c #30C228A22081",
+"HX	c #20811C711861",
+"JX	c #208118611040",
+"KX	c #10400C300820",
+"LX	c #B6DA8E3879E7",
+"PX	c #C71BBAEAAEBA",
+"IX	c #BEFBA6999E79",
+"UX	c #186118611040",
+"YX	c #082004100000",
+"TX	c #596545144103",
+"RX	c #38E330C228A2",
+"EX	c #082008200820",
+"WX	c #000000000000",
+"QX	c #51443CF338E3",
+"!X	c #8E3871C66185",
+"~X	c #082008200000",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                    . X o O                                                                     ",
+"                  + + @ # $ #                                                                   ",
+"                % % o & * = - O                                                                 ",
+"              ; ; @ X X : X % ;                                                                 ",
+"            +   > , < < < 1 : ; 2                                                               ",
+"            3 3 4 3 5 6 7 # 8 9 0                                                               ",
+"            1 1 q = 7 # . + % w e                 r t y u i p a s p d                           ",
+"                8 # f g h % j k l               z x c v b n     m M N B                         ",
+"                4 # o O : q e j V               t C i Z           a d A                         ",
+"                1 3 @ # S 1 D F G               t H J K           L P L                         ",
+"                % @ . O ; I j G U             Y J x t v Y T e R E W Q B                         ",
+"              O O O ! % ; ~ j ^           J x v J Y Y i K / T = ( ) _ B R                       ",
+"              ; ; O % @ % ` ' V         x u ] c b [ n n s { } B # |  ...X.o.R                   ",
+"              %   O @ l h ' U O.      +.@.] #.$.%.&.*.=.=.=.-.=.=.;.R :.V R R >.                ",
+"                  + + q 2 ' ,.        u x [ <.1.2.3.4.5.6.-.7.8.9.7.D 0.q.X.>.w.0.              ",
+"                > > e.; 0 e U       +.v [ r.3.t.1.y.6.u.i.7.p.a.9.s.d.f.^ 0.w.e g.              ",
+"                h.h.O ; I j.G       x b k.l.=.z.a.=.k.x.6.8.c.9.s.v.9.b.R g.,.n.m.:.            ",
+"                e.e.% l ' V n.    @.C A 1.2.M.8.=.=.=.x.6.*.N.s.s.B.V.C.q.>.Z.F g.m.            ",
+"                ; ; % l f.O.A.    x S.p.D.F.3.=.=.=.7.G.H.*.N.s.B.V.1.J.Z.^ V :.V G ^           ",
+"                : : l K.O.,.      J L.%.=.F.a.=.=.7.P.I.U.=.Y.B.V.1.T.R.n.^ ^ E.W.Q.,.          ",
+"                  ..; ~ b.n.      c !.%.=.a.7.=.-.=.*.~.^.R.Y.V.1.T./.B.(.^ (.n.,.^ ).          ",
+"                  1 l ' Z.E.      K _.=.M.7.=.7.=.`.A '.].[.Y.1.T.T.2.2.{.^ (.,.}.|.Z.          ",
+"                  e.' K. XU       b A 7.a.-.-.7.=.$.k .XJ XXc.T.T.2.oXoXA.n.,.A.E.,.n.          ",
+"              ;   OXG I U A.      L.Q =.y.7.7.8.8.[.+X@X%.p.p.T.2.oXoXT.#XE.Q.E.$X%Xn.          ",
+"              ' ' e I f.U         &XQ =.y.7.8.8.9.*X=XR.1.-X=./.;XoX:X>XQ.}.}.%X}.,XU           ",
+"              2 2 l ' <XE.        !.Q =.7.8.8.9.4.1X2XV.3X4X/.2.oX:XF.H.5X}.}.A.E.}.,X          ",
+"              2 2 l I  XA.        { Q 6XP.8.9.7X1X8XV.9.9X/.2.oX:XF.0XqXA.wXeXrX}.,XW.          ",
+"              l l ' n.$XO.          Q `.8.9.7Xs.B.V.1.tXs.2.oX:XF.0XT.yXuXiXuXrXpXaXsX          ",
+"              I I <XO.A.,.          } B 9.9.s.B.V.1.dX9.2.oX:XF.0XfXgXhXsXiXhXsXjXhX            ",
+"                kXlXzXU               N 6Xs.B.B.1.T.T.2.oXoXF.0X0XB.xXcXvXbXsXsXsXcX            ",
+"                0 n.Z.(.              nXmXs.B.1.T.T.2.oXoX:X0X0XfXMXNXBXvXvXhXcXvX              ",
+"            '   G E.|.Z.                mXVX1.CXT./.;XoX:X0X0XfXh ZXAXZXcXSXSXZXNX              ",
+"            e e K.A.A.{.                  DXVXT./.;XoX:XFX0XT.X Q.W.zXGXkXHXJXlXKX              ",
+"            b.b.U O.U ,.                ~ R LX= PX1.:X/.>XIX; I zXHXzXzXHXHXUX9 KXYX            ",
+"            b.b.,.E.U                 >.` ; ..:.l G TXG O.e TXI U O.RXGXHXHXlXEXEXWX            ",
+"            I I A.QXTX                    !X0.:.!Xl ' R ` :.e e O.G G kXHXUX9 EX~X              ",
+"            I   A.E.A.                                                                          ",
+"              (.(.n.                                                                            ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
diff -uNr gnome-0.6/lib/pixmaps/gnome-cromagnon.xpm gnome-0.7/lib/pixmaps/gnome-cromagnon.xpm
--- gnome-0.6/lib/pixmaps/gnome-cromagnon.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/gnome-cromagnon.xpm	Wed Oct  1 18:11:10 1997
@@ -0,0 +1,134 @@
+/* XPM */
+static char * gnome_cromagnon_xpm[] = {
+"48 48 83 1",
+" 	c #C71BCB2BC71B",
+".	c #C71BCB2BCF3C",
+"X	c #BEFBBEFBBEFB",
+"o	c #BEFBBAEABEFB",
+"O	c #B6DABAEABEFB",
+"+	c #BEFBC30BC71B",
+"@	c #C71BC30BC71B",
+"#	c #B6DAB6DAB6DA",
+"$	c #B6DABAEAB6DA",
+"%	c #C71BC71BC71B",
+"&	c #AEBAAEBAAEBA",
+"*	c #EFBEF3CEF7DE",
+"=	c #EFBEEBADEFBE",
+"-	c #D75CD75CD75C",
+";	c #CF3CD34CD75C",
+":	c #CF3CD34CCF3C",
+">	c #D75CDB6CD75C",
+",	c #DF7DDF7DDF7D",
+"<	c #E79DE38DE79D",
+"1	c #DF7DE38DE79D",
+"2	c #DF7DDB6CDF7D",
+"3	c #D75CDB6CDF7D",
+"4	c #71C67DF779E7",
+"5	c #492451445144",
+"6	c #A699AEBAAEBA",
+"7	c #A699AAAAAEBA",
+"8	c #A699AAAAA699",
+"9	c #A699A699A699",
+"0	c #AEBAB2CAB6DA",
+"q	c #AEBAB2CAAEBA",
+"w	c #9E79A289A699",
+"e	c #9E799E799E79",
+"r	c #96589E799E79",
+"t	c #96589A699658",
+"y	c #965896589658",
+"u	c #8E3892489658",
+"i	c #86178E388E38",
+"p	c #86178A288617",
+"a	c #79E786178617",
+"s	c #8E3892488E38",
+"d	c #8E3896589658",
+"f	c #96589A699E79",
+"g	c #514459655965",
+"h	c #49244D344924",
+"j	c #38E341034103",
+"k	c #410349244924",
+"l	c #86178A288E38",
+"z	c #410345144103",
+"x	c #9E79A699A699",
+"c	c #8E388E388E38",
+"v	c #38E33CF338E3",
+"b	c #9E79A2899E79",
+"n	c #AEBAB6DAB6DA",
+"m	c #38E338E338E3",
+"M	c #410341034103",
+"N	c #30C238E338E3",
+"B	c #79E7820779E7",
+"V	c #71C679E779E7",
+"C	c #71C679E771C6",
+"Z	c #30C234D330C2",
+"A	c #69A671C671C6",
+"S	c #492451444924",
+"D	c #D75CD34CD75C",
+"F	c #79E782078617",
+"G	c #41034D344924",
+"H	c #79E77DF779E7",
+"J	c #861786178617",
+"K	c #69A675D671C6",
+"L	c #CF3CCB2BCF3C",
+"P	c #CF3CCF3CCF3C",
+"I	c #69A66DB669A6",
+"U	c #30C230C230C2",
+"Y	c #208128A228A2",
+"T	c #208128A22081",
+"R	c #208124922081",
+"E	c #28A228A228A2",
+"W	c #30C238E330C2",
+"Q	c #28A22CB228A2",
+"!	c #514455555144",
+"~	c #492455555144",
+"^	c #51445D755965",
+"/	c #514459655144",
+"(	c #59655D755965",
+" .XXXXXXooOOXXXX+XXXXXXXX++@+XO#$###OX++%%%X#o&&",
+"X*=-;;;:;----------->>-,<<1,,2>>>>332,,111,33O45",
+"o,%&6&678999976&&6&&0q&wertyuipapisdfew9wfsidtgh",
+"$>8ddyyduuuudtfffffeeftffydduippidyyewwrdiidwsjk",
+"#>6ddttttyyytffttffffydytydduipluyyfwwespidfwljz",
+"#>0yutffeftytrtyffftyddffydduilidyfexwdlctrreavk",
+"#>0fufffeetytrffffydddyeeyuddiiuytew9filyrffepjh",
+"#>qeytffrryyfeerfyuuytfeetdydsuyyfbwwdluffffeijh",
+"n3&wfdytffyteeertdsutreeetdddudyyrwxfiitfftr9sjk",
+"n>&wtidtrfyfeeeftydyfeeefyudusdyyewwylufttr9&smM",
+"#>7btiyfefteeeefffyteeeefdssccudtw9wuiyfte8q&pNz",
+"#>7efuffefteefffftytebbeysciiisde98fiiytfw&6wBNh",
+"#36frtfeeftrfyyttyyfbwwrdiiiisye98bulutfrw7wyVNk",
+"$>7ytefffyyftyyfftyfeeeysiccsye97wdiitffw89eyCZz",
+"$>8uyefyddyfftfbbfytfetdudssde87wdisyffe76xbtCZz",
+"O>8yrxecsdyfffexwftfeetdyyustw78yiufweb87xrfdAZk",
+"O>8fw8eisdyfrew8wfteeetytyssr98esitx7998edsilANS",
+"O>8ew7eiudyfew99eftfeeyyyuisexwyice67erfililc4v5",
+"#-8ex7eiudyfeewbfttteryddcideweuide7wssipisurpj5",
+"#D9b98fpiuyreewwetyferyddsiyewesiyextpillsdyepvh",
+"0;8w79daiuyrbwxxeftfefdydssfwwfcutwwdFpicdttfFmG",
+"q;7w7biaidteww99bftftduduisfwwtidfxbiaidyyttfHNk",
+"#D6wxfJpuyfewwxxeyydusisiidewbdiye9rpiyttttffFNz",
+"O>9beyllytrewwwwfduscciiisye9essr99ypdtftttffFNk",
+"+3beftscyfeeewxwfsiiiicsudfwwycyw7wilyffttfffFNk",
+"@3weytddtreeew9wyiiilisuyfbwrusfw8fpstfffffffBNk",
+"%3wfdfydfeeeew9bdiilisdtewwedcdrw8eidtfffffffHNk",
+"%2efdftdtebeewweuillcyfewxedcufe98byytffftfffFNk",
+"%2ftyftyffeeeebruilidfewxwyistre99ftydtttttfrFmk",
+"%2tytertfffrebwfuiiiyewwwrsiyfrertiidsdyyttffFNk",
+"%2tyfeefffrewwwyipliywxxwycdtfffyuiiddudytfefBmG",
+"%2ydteeftyfew9eullisfwxwrusyffftyyyyyfydfffeeav5",
+"%2yytfrtyyfew8eiiisyrewetuuytfttttffttttbwbwwlj5",
+" 2tyffrtddtew9eiisdtreeetytttfttffffftytewwwwamk",
+" 2tyffrfddtewwbcpiutreefytfttfttfffffttftytyuKZz",
+"%2fytffrytfewbeuJlutreefyfetfeftftttttytfdippAZz",
+"%2eftffeffeewerypldfreefytrfeefftyytttyyydcicVNk",
+"%2efytteffbeeetdccyfeeefyterefdyyyyytttttyddyHNk",
+"%2ryyyteeferrfdciifweeffyyeeeysddyytfftfttyytHmk",
+"%2ryyyyeefeertdsssdfefffyyebfuidyyytfffffyyytFvG",
+"%2fyyyyteewxetyddyyytfttytebfcsddytftttttyytfFvh",
+"%3ttftdyewwxetyddyttrfdyttfftuuddyytyyytyyytfavG",
+"%2ffftdfw9xwryduddtteettftyytduddyyyyytftytfeavG",
+"%2eftdye989etdcisdytfwwfftddftdyytttttfffeeeeavh",
+"%,ryddf978wfdciliuyffwxfdydyeeyytfffffffewweeavh",
+"LPtsuye78wrdciilcdtffewrsuduaa44BFFHHBBFaaFFBImk",
+"+egUZZmvvZYTRRRRTYYEEEEYYTYENNZZWWZZZWWWNWZZZQQk",
+"J!hzkhS5hh!~5555!gggg^gg/!!gg((ggg//ggggggggg!z("};
diff -uNr gnome-0.6/lib/pixmaps/gnome-gimp-small.xpm gnome-0.7/lib/pixmaps/gnome-gimp-small.xpm
--- gnome-0.6/lib/pixmaps/gnome-gimp-small.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/gnome-gimp-small.xpm	Wed Oct  1 18:11:18 1997
@@ -0,0 +1,102 @@
+/* XPM */
+static char * gnome_gimp_small_xpm[] = {
+"22 16 83 1",
+" 	c None",
+".	c #4924451438E3",
+"X	c #79E779E76185",
+"o	c #69A665955144",
+"O	c #9E79924879E7",
+"+	c #61855D754924",
+"@	c #618561854924",
+"#	c #8E38820769A6",
+"$	c #79E775D66185",
+"%	c #69A661855144",
+"&	c #51444D3438E3",
+"*	c #9658861771C6",
+"=	c #71C671C65965",
+"-	c #4924492438E3",
+";	c #596559654924",
+":	c #30C230C228A2",
+">	c #618565956185",
+",	c #AEBAA2899658",
+"<	c #8E387DF769A6",
+"1	c #96588E3879E7",
+"2	c #A699A2899658",
+"3	c #618559654924",
+"4	c #596555554103",
+"5	c #104010401040",
+"6	c #28A228A228A2",
+"7	c #08200C300820",
+"8	c #618561855965",
+"9	c #965892488E38",
+"0	c #E79DE38DE79D",
+"q	c #C71BC30BBEFB",
+"w	c #CF3CCF3CCF3C",
+"e	c #DF7DDF7DDF7D",
+"r	c #DF7DDB6CD75C",
+"t	c #71C66DB65965",
+"y	c #514451444103",
+"u	c #208124921861",
+"i	c #514451445144",
+"p	c #965892489658",
+"a	c #30C234D330C2",
+"s	c #69A66DB66185",
+"d	c #618561856185",
+"f	c #D75CD75CD75C",
+"g	c #861782078617",
+"h	c #71C66DB66185",
+"j	c #41033CF330C2",
+"k	c #38E338E328A2",
+"l	c #000000000000",
+"z	c #514455555144",
+"x	c #38E33CF338E3",
+"c	c #514451444924",
+"v	c #8E38861779E7",
+"b	c #96588A2879E7",
+"n	c #965892488617",
+"m	c #A699A289A699",
+"M	c #C71BC30BC71B",
+"N	c #BEFBBAEAB6DA",
+"B	c #4103410330C2",
+"V	c #30C22CB22081",
+"C	c #208120812081",
+"Z	c #410341034103",
+"A	c #69A665956185",
+"S	c #79E771C65965",
+"D	c #79E775D669A6",
+"F	c #51444D344103",
+"G	c #186114511040",
+"H	c #186118611861",
+"J	c #69A66DB669A6",
+"K	c #30C230C22081",
+"L	c #618551444103",
+"P	c #5965514438E3",
+"I	c #4924410330C2",
+"U	c #38E330C22081",
+"Y	c #104010400820",
+"T	c #28A228A22081",
+"R	c #4103410338E3",
+"E	c #38E334D328A2",
+"W	c #208120811861",
+"Q	c #49243CF328A2",
+"!	c #86176DB64924",
+"~	c #AEBA965879E7",
+"^	c #9E799A699E79",
+"/	c #861786178617",
+"(	c #208124922081",
+"                  .   ",
+"    X             o   ",
+"     O           +@   ",
+"     #$         +%&   ",
+"     .*=.     -o%;:   ",
+"     >,<12$%3@+;4-    ",
+" 567890qwert+y-.-u    ",
+" ipasdefdgeh;-jku     ",
+"lazxcvbnmMN+yBkV      ",
+" CZzAoS$$D%F.jkG      ",
+" HiJ8y3%+;F..kK       ",
+"   yBjjBk:.%LPIU      ",
+"    7YYGTRyEWQ!~^>    ",
+"                 /aa  ",
+"                   (  ",
+"                      "};
diff -uNr gnome-0.6/lib/pixmaps/gnome-gimp-transparent.xpm gnome-0.7/lib/pixmaps/gnome-gimp-transparent.xpm
--- gnome-0.6/lib/pixmaps/gnome-gimp-transparent.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/gnome-gimp-transparent.xpm	Wed Oct  1 18:11:21 1997
@@ -0,0 +1,238 @@
+/* XPM */
+static char * gnome_gimp_transparent_xpm[] = {
+"48 48 187 2",
+"  	c None",
+". 	c #51444D344103",
+"X 	c #4924492438E3",
+"o 	c #9E79965879E7",
+"O 	c #186118611040",
+"+ 	c #79E775D66185",
+"@ 	c #596555554103",
+"# 	c #B6DAAAAA8E38",
+"$ 	c #9E79924879E7",
+"% 	c #61855D754924",
+"& 	c #79E771C65965",
+"* 	c #596551444103",
+"= 	c #596559654924",
+"- 	c #C71BB6DA9E79",
+"; 	c #96588A2871C6",
+": 	c #208120811861",
+"> 	c #71C669A65965",
+", 	c #71C66DB65965",
+"< 	c #514451444103",
+"1 	c #B6DAA6998E38",
+"2 	c #8E387DF769A6",
+"3 	c #28A228A22081",
+"4 	c #71C669A65144",
+"5 	c #51444D3438E3",
+"6 	c #9E798E3879E7",
+"7 	c #AEBAA2898617",
+"8 	c #69A669A65144",
+"9 	c #69A665955144",
+"0 	c #5144492438E3",
+"q 	c #8E38861769A6",
+"w 	c #69A661855144",
+"e 	c #38E334D328A2",
+"r 	c #8E38861771C6",
+"t 	c #618559654924",
+"y 	c #208124921861",
+"u 	c #618561854924",
+"i 	c #A699965879E7",
+"p 	c #86177DF769A6",
+"a 	c #4924451438E3",
+"s 	c #596555554924",
+"d 	c #9E798E3871C6",
+"f 	c #8E38820769A6",
+"g 	c #28A224921861",
+"h 	c #30C230C228A2",
+"j 	c #18611C711861",
+"k 	c #30C22CB22081",
+"l 	c #28A22CB22081",
+"z 	c #104014511040",
+"x 	c #9658861771C6",
+"c 	c #861779E76185",
+"v 	c #79E76DB65965",
+"b 	c #79E779E76185",
+"n 	c #69A661854924",
+"m 	c #38E338E330C2",
+"M 	c #BEFBBAEAB6DA",
+"N 	c #F7DEF7DEF7DE",
+"B 	c #FFFFFBEEFFFF",
+"V 	c #C71BC30BBEFB",
+"C 	c #CF3CCB2BC71B",
+"Z 	c #F7DEF3CEF7DE",
+"A 	c #FFFFFFFFFFFF",
+"S 	c #EFBEEFBEEFBE",
+"D 	c #AEBAA6999E79",
+"F 	c #41033CF330C2",
+"G 	c #000004100000",
+"H 	c #08200C300820",
+"J 	c #104010401040",
+"K 	c #D75CD34CCF3C",
+"L 	c #C71BC71BC71B",
+"P 	c #9E799E799E79",
+"I 	c #8E38820771C6",
+"U 	c #EFBEEBADEFBE",
+"Y 	c #28A228A228A2",
+"T 	c #514455555144",
+"R 	c #596559655965",
+"E 	c #38E338E338E3",
+"W 	c #C71BC30BC71B",
+"Q 	c #79E779E779E7",
+"! 	c #186118611861",
+"~ 	c #B6DAB2CAB6DA",
+"^ 	c #FFFFF7DEF7DE",
+"/ 	c #E79DE38DDF7D",
+"( 	c #E79DE79DE79D",
+") 	c #A699A289A699",
+"_ 	c #69A66DB669A6",
+"` 	c #BEFBBAEABEFB",
+"' 	c #4924451430C2",
+"] 	c #4103410330C2",
+"[ 	c #28A224922081",
+"{ 	c #618561856185",
+"} 	c #AEBAAEBAAEBA",
+"| 	c #59655D755965",
+" .	c #28A22CB228A2",
+"..	c #B6DAB6DAB6DA",
+"X.	c #AEBAAAAAAEBA",
+"o.	c #F7DEEFBEEFBE",
+"O.	c #A699A699A699",
+"+.	c #9E799A699E79",
+"@.	c #30C230C230C2",
+"#.	c #38E33CF338E3",
+"$.	c #DF7DDF7DDF7D",
+"%.	c #79E77DF771C6",
+"&.	c #4924410330C2",
+"*.	c #38E33CF328A2",
+"=.	c #38E338E328A2",
+"-.	c #410341034103",
+";.	c #8E388A2879E7",
+":.	c #C71BC30BB6DA",
+">.	c #208120812081",
+",.	c #082008200820",
+"<.	c #514451445144",
+"1.	c #DF7DDB6CDF7D",
+"2.	c #D75CD34CD75C",
+"3.	c #71C671C669A6",
+"4.	c #000000000000",
+"5.	c #79E77DF779E7",
+"6.	c #410345144103",
+"7.	c #30C234D330C2",
+"8.	c #492449244924",
+"9.	c #9E7992488617",
+"0.	c #AEBAAEBAA699",
+"q.	c #B6DAAEBAAEBA",
+"w.	c #96588E3879E7",
+"e.	c #9E799A699658",
+"r.	c #BEFBBEFBBEFB",
+"t.	c #49244D344924",
+"y.	c #596559655144",
+"u.	c #79E771C66185",
+"i.	c #86177DF76185",
+"p.	c #C71BBEFBB6DA",
+"a.	c #D75CD75CD75C",
+"s.	c #618565956185",
+"d.	c #69A665955965",
+"f.	c #8E388A288617",
+"g.	c #965892488E38",
+"h.	c #69A669A65965",
+"j.	c #71C671C671C6",
+"k.	c #69A665956185",
+"l.	c #79E775D65965",
+"z.	c #4103451430C2",
+"x.	c #18611C711040",
+"c.	c #69A669A66185",
+"v.	c #38E33CF330C2",
+"b.	c #618561855144",
+"n.	c #492449244103",
+"m.	c #69A66DB66185",
+"M.	c #61855D755144",
+"N.	c #69A65D755144",
+"B.	c #30C234D328A2",
+"V.	c #71C665955144",
+"C.	c #71C65D754103",
+"Z.	c #6185555538E3",
+"A.	c #59654D3430C2",
+"S.	c #5965492430C2",
+"D.	c #410338E328A2",
+"F.	c #49243CF328A2",
+"G.	c #4924410328A2",
+"H.	c #5144410330C2",
+"J.	c #186114511040",
+"K.	c #104010400820",
+"L.	c #4103410338E3",
+"P.	c #514451444924",
+"I.	c #86176DB65144",
+"U.	c #965875D65144",
+"Y.	c #965879E75965",
+"T.	c #8E3871C65144",
+"R.	c #79E765954924",
+"E.	c #71C65D754924",
+"W.	c #10400C300820",
+"Q.	c #208124922081",
+"!.	c #618561855965",
+"~.	c #4103451438E3",
+"^.	c #69A659654103",
+"/.	c #9E7982075965",
+"(.	c #B6DA965869A6",
+").	c #BEFB9E7971C6",
+"_.	c #C71B9E7971C6",
+"`.	c #BEFBBAEAAEBA",
+"'.	c #861782078617",
+"].	c #082008200000",
+"[.	c #30C22CB228A2",
+"{.	c #BEFB9A6971C6",
+"}.	c #D75CBEFBA699",
+"|.	c #E79DE38DE79D",
+" X	c #965892489658",
+".X	c #71C675D671C6",
+"XX	c #861786178617",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                . X             ",
+"                  o                                                           O + @             ",
+"                  # $                                                         % & *             ",
+"                  = - ;                                                     : > , <             ",
+"                    $ 1 2                                                 3 > , 4 5             ",
+"                    6 7 o ,                                               8 4 9 9 0             ",
+"                    : 7 o q 9                                         3 > 4 9 w % e             ",
+"                      , o r + t                                     y 8 4 9 u % t               ",
+"                      < i ; p & , a                             3 w , 4 9 % t s @               ",
+"                        r d f + , 4 . :                     g @ & , 4 9 w % @ @ h               ",
+"                        j o ; f + & , & + p h k l 3 3 3 4 8 4 4 9 9 w % t s @ 0 z               ",
+"                        y ; ; x 2 c + , v + + b & , 9 w n w n % % % t = @ * * m                 ",
+"                      M N B V p r p C Z A S D + & , 9 u % t @ @ * < < < < < F                   ",
+"      G H J H G     K L P Z B V I U N Z Z N Z C , > 9 % @ * . 5 X a a X 5 5 :                   ",
+"    G Y T R E j J = W Q ! ~ N ^ / ( ) _ ` S U ( p 4 w t @ 5 a ' ] F ] ' 5 [                     ",
+"    J { } ) |  .3 % ..j G X.N o.Z O.+.@.#.S ( $.%.8 u = < X &.F *.=.F ] g                       ",
+"    ! _ ..O.| @.@.-.;.} ) U U :./ P >.,.<.U 1.2.3.9 % @ 5 a F =.=.=.F :                         ",
+"  4.J <.5._ 6.7.#.8.= 9.0.q.w.p e.1.R 8.W 1.2.r.9 w = < X &.F =.=.=.:                           ",
+"  4.H 7.t.8.#.#.8.T y.u.c i.p p c p.$.1.1.a.W e.w % @ . a ] F =.=.=.:                           ",
+"    H Y 7.#.-.t.R s.d.9 , + c c c & I f.g.f.h.w % * 5 0 ' ] =.=.=.e                             ",
+"    ,.Y 7.-.t.R s.j.k.% 9 , & + l.& , , 4 9 w % = ] z.a ] F =.=.=.x.                            ",
+"       .-.<.R c.j.5.y.@ = % 9 , , 4 9 9 w % t = v.m X F F =.=.=.e                               ",
+"      j 6.| s.j.5.3.0 5 < @ t w w b.% % t s < ] F n.= F =.=.=.=.:                               ",
+"        ! 6.m.m.M.. a ' X 5 < @ @ @ @ * X =.[ N.> w s =.e =.=.3                                 ",
+"            % 9 = 5 ' ] ' a X X X a e 3 y [ B.< w V.V.C.Z.A.S.D.F.k G.H.                        ",
+"              k g 3 y y : : J.J K.z j [ e L.P.b.h.M.F Z.I.U.Y.Y.T.R.E.t.7.                      ",
+"                  ,.H O K.W.H K.O Q.h F . y.!.b.~.e =.x.  ^./.(.)._.`.~ '.{ |                   ",
+"                          ].J z O : y 3 [.h h 3 J.              I.{.}.S |.W  X.XT 6.|           ",
+"                                                                        ..N ( XX! @.8.          ",
+"                                                                              4.,.>.E <.        ",
+"                                                                                4.J Y -.        ",
+"                                                                                    ! @.8.      ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
diff -uNr gnome-0.6/lib/pixmaps/gnome-network-small.xpm gnome-0.7/lib/pixmaps/gnome-network-small.xpm
--- gnome-0.6/lib/pixmaps/gnome-network-small.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/gnome-network-small.xpm	Thu Oct  2 23:59:17 1997
@@ -0,0 +1,191 @@
+/* XPM */
+static char * gnome_network_small_xpm[] = {
+"16 16 172 2",
+"  	c #000000000000",
+". 	c #104018612081",
+"X 	c #1861410369A6",
+"o 	c #596575D671C6",
+"O 	c #69A679E771C6",
+"+ 	c #71C67DF771C6",
+"@ 	c #61856DB65965",
+"# 	c #38E3451438E3",
+"$ 	c #18611C711861",
+"% 	c #000004100820",
+"& 	c #2081451469A6",
+"* 	c #61858E38B6DA",
+"= 	c #A699AAAA9E79",
+"- 	c #514459655965",
+"; 	c #59655D755965",
+": 	c #861786178E38",
+"> 	c #96589A699658",
+", 	c #79E7820771C6",
+"< 	c #86178E385965",
+"1 	c #4103492430C2",
+"2 	c #000008200000",
+"3 	c #30C25D758E38",
+"4 	c #9658B2CABEFB",
+"5 	c #F7DEEFBED75C",
+"6 	c #C71BC71BB6DA",
+"7 	c #38E33CF338E3",
+"8 	c #9E799E799E79",
+"9 	c #B6DAB2CAB6DA",
+"0 	c #8E388E388E38",
+"q 	c #9658924879E7",
+"w 	c #BEFBBAEA79E7",
+"e 	c #861775D64924",
+"r 	c #082008200820",
+"t 	c #208145146185",
+"y 	c #A699BEFBCF3C",
+"u 	c #FFFFFBEEE79D",
+"i 	c #CF3CCF3CB6DA",
+"p 	c #492449244103",
+"a 	c #28A228A228A2",
+"s 	c #596559655144",
+"d 	c #71C675D671C6",
+"f 	c #8E388E3879E7",
+"g 	c #B6DAB2CA8617",
+"h 	c #AEBA9E796185",
+"j 	c #596555554103",
+"k 	c #082018612081",
+"l 	c #49248207B6DA",
+"z 	c #E79DDF7DBEFB",
+"x 	c #FFFFFBEEDF7D",
+"c 	c #F7DEF7DED75C",
+"v 	c #861786178617",
+"b 	c #596559655965",
+"n 	c #514451445144",
+"m 	c #AEBAAEBA8617",
+"M 	c #A699A6998617",
+"N 	c #A6999A696185",
+"B 	c #861782076185",
+"V 	c #208120812081",
+"C 	c #49248207BEFB",
+"Z 	c #AEBABAEAA699",
+"A 	c #CF3CCF3CA699",
+"S 	c #C71BCB2BA699",
+"D 	c #965892488E38",
+"F 	c #AEBAAAAAAEBA",
+"G 	c #618565956185",
+"H 	c #492449244924",
+"J 	c #596561855965",
+"K 	c #E79DDF7D9E79",
+"L 	c #E79DD75C9658",
+"P 	c #51445D755965",
+"I 	c #71C671C65144",
+"U 	c #49244D344103",
+"Y 	c #30C261859658",
+"T 	c #51448E38BEFB",
+"R 	c #61859248B6DA",
+"E 	c #79E796589E79",
+"W 	c #AEBAAEBAA699",
+"Q 	c #B6DAB6DAB6DA",
+"! 	c #A699A699AEBA",
+"~ 	c #79E77DF779E7",
+"^ 	c #410341034103",
+"/ 	c #8617820771C6",
+"( 	c #A699A6998E38",
+") 	c #59656DB671C6",
+"_ 	c #20813CF35144",
+"` 	c #38E349244924",
+"' 	c #514455554103",
+"] 	c #38E36DB6A699",
+"[ 	c #51448617BEFB",
+"{ 	c #51448617B6DA",
+"} 	c #71C68E38A699",
+"| 	c #A699AAAA9658",
+" .	c #CF3CCB2BCF3C",
+"..	c #71C671C671C6",
+"X.	c #618561855965",
+"o.	c #CF3CB2CA8617",
+"O.	c #BEFBB2CA8617",
+"+.	c #30C245144924",
+"@.	c #30C269A69E79",
+"#.	c #410379E7AEBA",
+"$.	c #49247DF7B6DA",
+"%.	c #49247DF7AEBA",
+"&.	c #51447DF7A699",
+"*.	c #A699A2899658",
+"=.	c #AEBAAEBAAEBA",
+"-.	c #8E388A288E38",
+";.	c #79E779E771C6",
+":.	c #A699965871C6",
+">.	c #69A675D671C6",
+",.	c #28A2514469A6",
+"<.	c #208141035965",
+"1.	c #20813CF34924",
+"2.	c #28A23CF34924",
+"3.	c #28A2514479E7",
+"4.	c #410375D6A699",
+"5.	c #410375D69E79",
+"6.	c #618582079658",
+"7.	c #AEBAAAAAA699",
+"8.	c #71C671C66185",
+"9.	c #B6DAA28971C6",
+"0.	c #71C679E771C6",
+"q.	c #28A24D3469A6",
+"w.	c #186130C24103",
+"e.	c #104030C24924",
+"r.	c #30C265959658",
+"t.	c #38E369A69E79",
+"y.	c #38E369A69658",
+"u.	c #69A682078E38",
+"i.	c #C71BBEFBB6DA",
+"p.	c #8E388E3871C6",
+"a.	c #96589A6971C6",
+"s.	c #61856DB669A6",
+"d.	c #28A249246185",
+"f.	c #208138E34924",
+"g.	c #20812CB238E3",
+"h.	c #082010401861",
+"j.	c #28A255558617",
+"k.	c #30C261858E38",
+"l.	c #492469A68617",
+"z.	c #86177DF771C6",
+"x.	c #A699A28971C6",
+"c.	c #5144659569A6",
+"v.	c #38E351445965",
+"b.	c #186118611861",
+"n.	c #104028A24103",
+"m.	c #2081514479E7",
+"M.	c #4924618571C6",
+"N.	c #AEBA965871C6",
+"B.	c #71C671C669A6",
+"V.	c #30C249245965",
+"C.	c #28A241035144",
+"Z.	c #186128A230C2",
+"A.	c #000004100000",
+"S.	c #186130C24924",
+"D.	c #208141036185",
+"F.	c #514469A679E7",
+"G.	c #4103596569A6",
+"H.	c #2081410369A6",
+"J.	c #18613CF36185",
+"K.	c #20813CF35965",
+"L.	c #18613CF35144",
+"P.	c #18612CB238E3",
+"I.	c #186128A238E3",
+"U.	c #4103596571C6",
+"Y.	c #28A241035965",
+"T.	c #18613CF35965",
+"R.	c #1040249230C2",
+"E.	c #08200C300820",
+"W.	c #186134D35144",
+"Q.	c #186138E35965",
+"!.	c #186138E35144",
+"~.	c #104014511861",
+"        . X o O + @ # $         ",
+"    % & * = - ; : > , < 1 2     ",
+"  % 3 4 5 6 7 7 8 9 0 q w e r   ",
+"  t y u u i p a s 0 d f g h j   ",
+"k l z x c 6 v 7 7 b n m M N B V ",
+"t C Z A S D F 8 G H J K L P I U ",
+"Y C T R E W Q ! ~ ^ / ( ) _ ` ' ",
+"] l [ { } |  .F ..X.o.O.t _ +.` ",
+"@.#.$.%.&.*.=.-.;.:.>.,.<._ 1.2.",
+"3.] 4.5.6.7.8 8.9.0.q.t _ 1.1.w.",
+"e.r.t.y.u.i.0 p.a.s.d._ f.1._ g.",
+"h.j.3 k.l.D z.x.c.v.G _ f.f.f.b.",
+"  n.m.3.M.~ N.B.t V.C._ 1.f.Z.  ",
+"  A.S.D.F.G.H.J.J.K._ _ L.P.A.  ",
+"    A.I.U.Y.J.K.T.K.T.T.R.A.    ",
+"      E.a g.W.Q.!.S.R.~.        "};
diff -uNr gnome-0.6/lib/pixmaps/netscape3-small.xpm gnome-0.7/lib/pixmaps/netscape3-small.xpm
--- gnome-0.6/lib/pixmaps/netscape3-small.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/netscape3-small.xpm	Wed Oct  1 20:39:25 1997
@@ -0,0 +1,122 @@
+/* XPM */
+static char * netscape3_xpm[] = {
+"18 16 103 2",
+"  	c #000008200820",
+". 	c #00000C301040",
+"X 	c #000010401040",
+"o 	c #000014511040",
+"O 	c #000014511861",
+"+ 	c #000018611861",
+"@ 	c #00001C712081",
+"# 	c #104034D338E3",
+"$ 	c #69A686178617",
+"% 	c #C71BCB2BCF3C",
+"& 	c #79E78E389658",
+"* 	c #0000249228A2",
+"= 	c #71C686178E38",
+"- 	c #BEFBC71BCF3C",
+"; 	c #9658A699A699",
+": 	c #28A245144924",
+"> 	c #000028A230C2",
+", 	c #79E796589E79",
+"< 	c #F7DEF3CEF7DE",
+"1 	c #59657DF78617",
+"2 	c #00002CB230C2",
+"3 	c #86179A699E79",
+"4 	c #38E35D756185",
+"5 	c #000030C238E3",
+"6 	c #492471C679E7",
+"7 	c #9E79B6DABEFB",
+"8 	c #EFBEEFBEEFBE",
+"9 	c #38E3659569A6",
+"0 	c #000034D338E3",
+"q 	c #69A68A288E38",
+"w 	c #28A259656185",
+"e 	c #000038E34103",
+"r 	c #208155555965",
+"t 	c #9E79B2CABEFB",
+"y 	c #E79DEBADEFBE",
+"u 	c #69A68A289658",
+"i 	c #28A25D756185",
+"p 	c #00003CF34103",
+"a 	c #00003CF34924",
+"s 	c #492479E78617",
+"d 	c #186155555965",
+"f 	c #082049245144",
+"g 	c #C71BD34CD75C",
+"h 	c #E79DE79DEFBE",
+"j 	c #208159656185",
+"k 	c #000041034924",
+"l 	c #69A692489658",
+"z 	c #28A2618569A6",
+"x 	c #000045145144",
+"c 	c #000049245144",
+"v 	c #49247DF78617",
+"b 	c #186159656185",
+"n 	c #104055556185",
+"m 	c #C71BD75CD75C",
+"M 	c #DF7DE38DE79D",
+"N 	c #2081618569A6",
+"B 	c #69A696589E79",
+"V 	c #28A269A671C6",
+"C 	c #00004D345965",
+"Z 	c #000051445965",
+"A 	c #492486178E38",
+"S 	c #208169A671C6",
+"D 	c #000055556185",
+"F 	c #1861659571C6",
+"G 	c #D75CE79DE79D",
+"H 	c #C71BD75CDF7D",
+"J 	c #10405D7569A6",
+"K 	c #69A69E79A699",
+"L 	c #30C275D679E7",
+"P 	c #00004D345144",
+"I 	c #000051446185",
+"U 	c #000059656185",
+"Y 	c #0000596569A6",
+"T 	c #49248E389658",
+"R 	c #20816DB679E7",
+"E 	c #0000618569A6",
+"W 	c #30C27DF78E38",
+"Q 	c #B6DACB2BD75C",
+"! 	c #79E7A699AEBA",
+"~ 	c #30C27DF78617",
+"^ 	c #00005D7569A6",
+"/ 	c #0000618571C6",
+"( 	c #6185A289AEBA",
+") 	c #410382078E38",
+"_ 	c #18615D7569A6",
+"` 	c #000045144924",
+"' 	c #514479E779E7",
+"] 	c #DF7DDF7DDF7D",
+"[ 	c #DF7DE79DE79D",
+"{ 	c #41038E389E79",
+"} 	c #082045144924",
+"| 	c #186134D338E3",
+" .	c #104018611861",
+"..	c #861786178E38",
+"X.	c #5965659569A6",
+"o.	c #000000000000",
+"O.	c #10401C712081",
+"+.	c #18614D345144",
+"@.	c #514455555144",
+"#.	c #8E388A288E38",
+"$.	c #861786178617",
+"%.	c #514459655965",
+"&.	c #000004100000",
+"  . . X X X X X X X X X X X X . .   ",
+"o O O O + + + + + + + + + + O O O o ",
+"+ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + + ",
+"@ @ # $ % & * * * * # = - ; : @ @ @ ",
+"* * > > , < 1 2 2 2 2 > 3 4 > > * * ",
+"2 2 5 5 6 7 8 9 0 0 0 0 q w 5 2 2 2 ",
+"5 0 0 e 6 r t y 9 e e e u i e 0 0 0 ",
+"e p p a s d f g h j k k l z a p p e ",
+"k k x c v b c n m M N c B V c x k k ",
+"c C C Z A S D D F G H J K L Z C P c ",
+"I D U Y T R U E E W y Q ! ~ Y U D I ",
+"^ ^ E / ( ) _ P ` c ' ] [ { / / ^ ^ ",
+"J } |  ...X.o.o.o.o.o.o.o.o.O.| +.J ",
+"o.o.o.@.#.$.%.o.o.o.o.o.o.o.o.o.o.&.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o."};
diff -uNr gnome-0.6/lib/pixmaps/panel-menu-main.xpm gnome-0.7/lib/pixmaps/panel-menu-main.xpm
--- gnome-0.6/lib/pixmaps/panel-menu-main.xpm	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/lib/pixmaps/panel-menu-main.xpm	Wed Oct  1 18:10:30 1997
@@ -0,0 +1,225 @@
+/* XPM */
+static char * gnome_gnomefoot_xpm[] = {
+"48 34 188 2",
+"  	c None",
+". 	c #AEBAA28971C6",
+"X 	c #A6999A6971C6",
+"o 	c #CF3CC30B8E38",
+"O 	c #96588A286185",
+"+ 	c #79E775D65144",
+"@ 	c #96588E386185",
+"# 	c #B6DAAAAA79E7",
+"$ 	c #F7DEE38DA699",
+"% 	c #79E771C65144",
+"& 	c #C71BBAEA8617",
+"* 	c #FFFFEBADAEBA",
+"= 	c #FFFFEFBEAEBA",
+"- 	c #FFFFF3CEAEBA",
+"; 	c #D75CC71B8E38",
+": 	c #8E3882075965",
+"> 	c #F7DEEBADAEBA",
+", 	c #71C671C65144",
+"< 	c #A699965869A6",
+"1 	c #BEFBAEBA79E7",
+"2 	c #FFFFF3CEB6DA",
+"3 	c #D75CC71B9658",
+"4 	c #FFFFF3CED75C",
+"5 	c #B6DAA69979E7",
+"6 	c #FFFFF3CECF3C",
+"7 	c #F7DEDF7DA699",
+"8 	c #F7DEE38DC71B",
+"9 	c #F7DEEFBECF3C",
+"0 	c #E79DD75C9E79",
+"q 	c #F7DEE79DA699",
+"w 	c #FFFFEBADB6DA",
+"e 	c #FFFFEFBECF3C",
+"r 	c #EFBEDF7DA699",
+"t 	c #861771C65144",
+"y 	c #79E76DB64924",
+"u 	c #861775D65144",
+"i 	c #965886176185",
+"p 	c #AEBA9A6971C6",
+"a 	c #D75CBEFB8E38",
+"s 	c #861779E75965",
+"d 	c #8E3879E75965",
+"f 	c #CF3CBAEA8617",
+"g 	c #71C661854103",
+"h 	c #79E769A64924",
+"j 	c #B6DA9A6971C6",
+"k 	c #D75CB6DA8617",
+"l 	c #D75CBAEA8617",
+"z 	c #CF3CAEBA8617",
+"x 	c #BEFBA28979E7",
+"c 	c #EFBED34C9E79",
+"v 	c #EFBED75CB6DA",
+"b 	c #861769A65144",
+"n 	c #79E765954924",
+"m 	c #C71BA28971C6",
+"M 	c #DF7DB6DA8617",
+"N 	c #DF7DBAEA8617",
+"B 	c #DF7DBAEA8E38",
+"V 	c #D75CB2CA8617",
+"C 	c #D75CBAEA8E38",
+"Z 	c #E79DCB2B9658",
+"A 	c #EFBEDB6CC71B",
+"S 	c #79E761854924",
+"D 	c #9E797DF75965",
+"F 	c #D75CAAAA79E7",
+"G 	c #D75CAEBA79E7",
+"H 	c #D75CAEBA8617",
+"J 	c #DF7DB2CA8617",
+"K 	c #E79DBEFB8E38",
+"L 	c #E79DC30BA699",
+"P 	c #861769A64924",
+"I 	c #A69982076185",
+"U 	c #CF3CA28971C6",
+"Y 	c #CF3CA28979E7",
+"T 	c #D75CA69979E7",
+"R 	c #9E7986176185",
+"E 	c #A69986176185",
+"W 	c #AEBA7DF75965",
+"Q 	c #CF3C965871C6",
+"! 	c #CF3C9A6971C6",
+"~ 	c #CF3C9E7971C6",
+"^ 	c #6185514438E3",
+"/ 	c #86176DB65144",
+"( 	c #BEFB86176185",
+") 	c #C71B8E3869A6",
+"_ 	c #C71B924869A6",
+"` 	c #C71B965869A6",
+"' 	c #8E386DB65144",
+"] 	c #D75CBAEAAEBA",
+"[ 	c #BEFB82076185",
+"{ 	c #C71B8A2869A6",
+"} 	c #CF3C965879E7",
+"| 	c #CF3C9E798E38",
+" .	c #E79DD34CBEFB",
+"..	c #9E7969A65144",
+"X.	c #BEFB7DF76185",
+"o.	c #C71B92488617",
+"O.	c #6185410330C2",
+"+.	c #B6DA75D65965",
+"@.	c #B6DA79E75965",
+"#.	c #BEFB79E75965",
+"$.	c #BEFB7DF75965",
+"%.	c #BEFB820769A6",
+"&.	c #BEFB92488617",
+"*.	c #61853CF328A2",
+"=.	c #AEBA6DB65144",
+"-.	c #B6DA6DB65144",
+";.	c #B6DA71C65144",
+":.	c #B6DA71C65965",
+">.	c #B6DA7DF771C6",
+",.	c #BEFB96588617",
+"<.	c #618538E328A2",
+"1.	c #AEBA61854924",
+"2.	c #AEBA65954924",
+"3.	c #AEBA65955144",
+"4.	c #AEBA69A65144",
+"5.	c #B6DA8A288617",
+"6.	c #B6DA92488617",
+"7.	c #61852CB22081",
+"8.	c #59652CB22081",
+"9.	c #618534D328A2",
+"0.	c #51442CB22081",
+"q.	c #514428A22081",
+"w.	c #79E7451430C2",
+"e.	c #A69959654103",
+"r.	c #A69959654924",
+"t.	c #A6995D754924",
+"y.	c #AEBA5D754924",
+"u.	c #AEBA92488E38",
+"i.	c #B6DA8E388617",
+"p.	c #492420811861",
+"a.	c #514424921861",
+"s.	c #71C634D328A2",
+"d.	c #79E738E330C2",
+"f.	c #79E738E328A2",
+"g.	c #71C638E328A2",
+"h.	c #8E38410330C2",
+"j.	c #9E794D3438E3",
+"k.	c #9E7951444103",
+"l.	c #A69951444103",
+"z.	c #A69955554103",
+"x.	c #AEBA8E388617",
+"c.	c #514420811861",
+"v.	c #51441C711861",
+"b.	c #861734D328A2",
+"n.	c #96583CF330C2",
+"m.	c #9658410330C2",
+"M.	c #9E79451438E3",
+"N.	c #9E79492438E3",
+"B.	c #9E7951444924",
+"V.	c #B6DA96588E38",
+"C.	c #514418611861",
+"Z.	c #69A620811861",
+"A.	c #8E3830C228A2",
+"S.	c #8E3834D328A2",
+"D.	c #965838E330C2",
+"F.	c #9658410338E3",
+"G.	c #AEBA8A288617",
+"H.	c #CF3CA2899E79",
+"J.	c #514414511040",
+"K.	c #69A61C711861",
+"L.	c #861728A22081",
+"P.	c #8E3828A228A2",
+"I.	c #8E382CB228A2",
+"U.	c #9E7975D671C6",
+"Y.	c #D75CAAAAA699",
+"T.	c #BEFB92488E38",
+"R.	c #618518611861",
+"E.	c #861720812081",
+"W.	c #861724922081",
+"Q.	c #8E3828A22081",
+"!.	c #8E383CF338E3",
+"~.	c #AEBA86178617",
+"^.	c #CF3CA289A699",
+"/.	c #C71B92489658",
+"(.	c #69A618611861",
+").	c #86171C711861",
+"_.	c #86174D344924",
+"`.	c #BEFB92489658",
+"'.	c #C71B9A699658",
+"].	c #79E71C711861",
+"[.	c #861728A228A2",
+"{.	c #96586DB669A6",
+"}.	c #C71B9A699E79",
+"|.	c #861749244924",
+" X	c #8E3869A669A6",
+".X	c #A69979E779E7",
+"XX	c #BEFB8E388E38",
+"oX	c #BEFB8A288E38",
+"                                                                                                ",
+"                                                                                                ",
+"                                            . X o                                               ",
+"                                          O + @ # $                                             ",
+"                                          % & * = - -   O O ;                                   ",
+"                                          : > = = - -   , & $ =                                 ",
+"                                          < * = = - - 1 @ = - 2                                 ",
+"                                          3 $ * * 4 = # 5 - 6 6                                 ",
+"                                            7 $ 8 9   0 q w e                                   ",
+"                                                        7 $   1 5 r                             ",
+"                                          t y u i p a       s d f 7                             ",
+"                                        g h j k l z x k     u a c v                             ",
+"                                      b n m M M N B B V k   C Z A 8                             ",
+"                                      S D F G H V V J M V B   K L                               ",
+"                                      P I U Y T T F F F G J     R E z                           ",
+"                                      W W Q ! ! ~ ~ U Y Y F F   ^ / F                           ",
+"                                        ( ) ) _ _ ` Q ! ! ~ Y   ' T ]                           ",
+"                                          ( [ ( { { ) ) _ Q }   ` |  .                          ",
+"                                              ..X.[ ( ( ( { o.                                  ",
+"                                              O.+.@.#.$.$.%.&.                                  ",
+"                                              *.=.-.;.:.+.>.,.                                  ",
+"                                              <.1.2.3.4.4.5.6.                                  ",
+"                                  7.8.9.9.0.q.w.e.r.t.y.1.u.i.                                  ",
+"                                p.a.s.d.f.g.h.j.k.l.z.z.z.x.                                    ",
+"                              c.v.b.n.n.n.m.m.M.M.N.N.j.B.V.                                    ",
+"                              C.Z.A.A.S.S.D.D.n.n.n.m.F.G.H.                                    ",
+"                              J.K.L.L.P.I.I.A.A.S.S.D.U.Y.T.                                    ",
+"                              R.R.E.E.E.W.W.W.L.Q.!.~.^./.                                      ",
+"                                (.).E.E.E.E.E.E._.`.'.                                          ",
+"                                ].E.E.E.E.E.[.{.}./.                                            ",
+"                                    [.|. X{..XXXoX                                              ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
diff -uNr gnome-0.6/libgnome/gnome-config.c gnome-0.7/libgnome/gnome-config.c
--- gnome-0.6/libgnome/gnome-config.c	Wed Sep 24 18:24:09 1997
+++ gnome-0.7/libgnome/gnome-config.c	Wed Oct  1 19:56:00 1997
@@ -39,7 +39,7 @@
    /gmix/Balance/Ratio=0.5
    /filemanager/Panel Display/html=1
 
-   If the pathname starts with '#', then instead of being a ~/.gnome relative
+   If the pathname starts with '=', then instead of being a ~/.gnome relative
    file, it is an abolute pathname, example:
 
    =/home/miguel/.mc.ini=/Left Panel/reverse=1
@@ -94,7 +94,7 @@
 
 typedef struct {
 	char *file, *section, *key, *def;
-	char *path;
+	char *path, *opath;
 } ParsedPath;
 
 /*
@@ -113,7 +113,7 @@
 static void
 release_path (ParsedPath *p)
 {
-	g_free (p->path);
+	g_free (p->opath);
 	g_free (p);
 }
 
@@ -123,17 +123,19 @@
 	ParsedPath *p = g_malloc (sizeof (ParsedPath));
 	char *sep;
 
-	if (*path == '='){
+	if (*path == '/' || prefix == NULL)
+		p->opath = strdup (path);
+	else
+		p->opath = g_copy_strings (prefix, path, NULL);
+
+	p->path = p->opath;
+	
+	if (*p->path == '='){
 		sep = "=";
-		path++;
+		p->path++;
 	} else
 		sep = "/=";
 	
-	if (*path == '/' || prefix == NULL)
-		p->path = strdup (path);
-	else
-		p->path = g_copy_strings (prefix, path, NULL);
-
 	p->file    = strtok (p->path, sep);
 	p->section = strtok (NULL, "/=");
 	p->key     = strtok (NULL, "/=");
@@ -564,7 +566,8 @@
 	
 	pp = parse_path (path);
 	r = access_config (LOOKUP, pp->section, pp->key, pp->def, pp->file);
-	r = strdup (r);
+	if (r)
+		r = strdup (r);
 	release_path (pp);
 	return r;
 }
@@ -597,4 +600,13 @@
 gnome_config_set_prefix (char *path)
 {
 	prefix = strdup (path);
+}
+
+void
+gnome_config_drop_prefix (void)
+{
+	if (!prefix)
+		return;
+	free (prefix);
+	prefix = 0;
 }
diff -uNr gnome-0.6/libgnome/gnome-config.h gnome-0.7/libgnome/gnome-config.h
--- gnome-0.6/libgnome/gnome-config.h	Wed Sep 24 18:24:09 1997
+++ gnome-0.7/libgnome/gnome-config.h	Wed Oct  1 16:20:07 1997
@@ -29,6 +29,9 @@
 /* This routine drops all of the information related to /file/section */
 void gnome_config_clean_section  (char *path);
 
+void gnome_config_set_prefix (char *path);
+void gnome_config_drop_prefix (void);
+
 END_GNOME_DECLS
 
 #endif
diff -uNr gnome-0.6/libgnome/gnome-util.c gnome-0.7/libgnome/gnome-util.c
--- gnome-0.6/libgnome/gnome-util.c	Wed Sep 24 18:24:23 1997
+++ gnome-0.7/libgnome/gnome-util.c	Wed Oct  1 21:08:44 1997
@@ -6,11 +6,12 @@
 #include <string.h>
 #include <unistd.h>
 #include <glib.h>
+#include <sys/stat.h>
 #include "gnome-defs.h"
 #include "gnome-util.h"
 
 static char *
-gnome_dirrelative_file (char *base, char *sub, char *filename)
+gnome_dirrelative_file (char *base, char *sub, char *filename, int unconditional)
 {
         static char *gnomedir = NULL;
 	char *f, *t, *u;
@@ -24,7 +25,7 @@
 		u = g_copy_strings (t, "/", filename, NULL);
 		g_free (t);
 		
-		if (g_file_exists (u))
+		if (g_file_exists (u) || unconditional)
 			return u;
 		
 		g_free (u);
@@ -33,7 +34,7 @@
 	/* Then try the hardcoded path */
 	f = g_concat_dir_and_file (base, filename);
 	
-	if (g_file_exists (f))
+	if (g_file_exists (f) || unconditional)
 		return f;
 	
 	g_free (f);
@@ -49,21 +50,53 @@
 }
 
 /* DOC: gnome_libdir_file (char *filename)
- * Returns a newly allocated pathname poiting to a file in the gnome libdir
+ * Returns a newly allocated pathname pointing to a file in the gnome libdir
  */
 char *
 gnome_libdir_file (char *filename)
 {
-	return (gnome_dirrelative_file (GNOMELIBDIR, "lib", filename));
+	return (gnome_dirrelative_file (GNOMELIBDIR, "lib", filename, FALSE));
 }
 
 /* DOC: gnome_sharedir_file (char *filename)
- * Returns a newly allocated pathname poiting to a file in the gnome sharedir
+ * Returns a newly allocated pathname pointing to a file in the gnome sharedir
  */
 char *
 gnome_datadir_file (char *filename)
 {
-	return (gnome_dirrelative_file (GNOMEDATADIR, "share", filename));
+	return (gnome_dirrelative_file (GNOMEDATADIR, "share", filename, FALSE));
+}
+
+char *
+gnome_pixmap_file (char *filename)
+{
+	return (gnome_dirrelative_file (GNOMEDATADIR "/pixmaps", "share/pixmaps", filename, FALSE));
+}
+
+char *
+gnome_unconditional_pixmap_file (char *filename)
+{
+	return (gnome_dirrelative_file (GNOMEDATADIR "/pixmaps", "share/pixmaps", filename, TRUE));
+}
+
+/* DOC: gnome_unconditional_libdir_file (char *filename)
+ * Returns a newly allocated pathname pointing to a (possibly
+ * non-existent) file in the gnome libdir
+ */
+char *
+gnome_unconditional_libdir_file (char *filename)
+{
+	return (gnome_dirrelative_file (GNOMELIBDIR, "lib", filename, TRUE));
+}
+
+/* DOC: gnome_unconditional_datadir_file (char *filename)
+ * Returns a newly allocated pathname pointing to a (possibly
+ * non-existent) file in the gnome libdir
+ */
+char *
+gnome_unconditional_datadir_file (char *filename)
+{
+	return (gnome_dirrelative_file (GNOMEDATADIR, "share", filename, TRUE));
 }
 
 /* DOC: g_file_exists (char *filename)
@@ -72,7 +105,9 @@
 int
 g_file_exists (char *filename)
 {
-	return access (filename, R_OK) == 0;
+	struct stat s;
+	
+	return stat (filename, &s) == 0;
 }
 
 
diff -uNr gnome-0.6/libgnome/gnome-util.h gnome-0.7/libgnome/gnome-util.h
--- gnome-0.6/libgnome/gnome-util.h	Wed Sep 24 18:24:23 1997
+++ gnome-0.7/libgnome/gnome-util.h	Wed Oct  1 19:12:46 1997
@@ -8,6 +8,10 @@
 
 char *gnome_libdir_file (char *filename);
 char *gnome_datadir_file (char *filename);
+char *gnome_pixmap_file (char *filename);
+char *gnome_unconditional_libdir_file (char *filename);
+char *gnome_unconditional_datadir_file (char *filename);
+char *gnome_unconditional_pixmap_file (char *filename);
 int   g_file_exists (char *filename);
 char *g_copy_strings (const char *first, ...);
 char *g_unix_error_string (int error_num);
@@ -15,9 +19,6 @@
 char *gnome_util_user_home(void);
 char *gnome_util_prepend_user_home(char *file);
 gchar *gnome_util_home_file(char *file);
-
-
-
 
 END_GNOME_DECLS
 
diff -uNr gnome-0.6/libgnomeui/Makefile.am gnome-0.7/libgnomeui/Makefile.am
--- gnome-0.6/libgnomeui/Makefile.am	Thu Sep 25 13:34:14 1997
+++ gnome-0.7/libgnomeui/Makefile.am	Wed Oct  1 12:42:10 1997
@@ -13,6 +13,7 @@
 	gnome-init.c			\
 	gnome-actionarea.c		\
 	gnome-messagebox.c		\
+	gnome-pixmap.c			\
 	gnome-colors.c
 
 libgnomeuiinclude_HEADERS = 		\
@@ -21,6 +22,7 @@
 	gnome-colors.h         		\
 	gnome-messagebox.h		\
 	gnome-properties.h     		\
+	gnome-pixmap.h			\
 	libgnomeui.h
 
 
diff -uNr gnome-0.6/libgnomeui/Makefile.in gnome-0.7/libgnomeui/Makefile.in
--- gnome-0.6/libgnomeui/Makefile.in	Tue Sep 30 00:39:37 1997
+++ gnome-0.7/libgnomeui/Makefile.in	Fri Oct  3 01:04:27 1997
@@ -95,6 +95,7 @@
 	gnome-init.c			\
 	gnome-actionarea.c		\
 	gnome-messagebox.c		\
+	gnome-pixmap.c			\
 	gnome-colors.c
 
 libgnomeuiinclude_HEADERS = 		\
@@ -103,6 +104,7 @@
 	gnome-colors.h         		\
 	gnome-messagebox.h		\
 	gnome-properties.h     		\
+	gnome-pixmap.h			\
 	libgnomeui.h
 
 libgnomeui_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
@@ -120,7 +122,8 @@
 X_PRE_LIBS = @X_PRE_LIBS@
 libgnomeui_la_LIBADD = 
 libgnomeui_la_OBJECTS =  gnome-color-selector.lo gnome-properties.lo \
-gnome-init.lo gnome-actionarea.lo gnome-messagebox.lo gnome-colors.lo
+gnome-init.lo gnome-actionarea.lo gnome-messagebox.lo gnome-pixmap.lo \
+gnome-colors.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -260,6 +263,8 @@
 	gnome-colors.h
 gnome-messagebox.o gnome-messagebox.lo: gnome-messagebox.c \
 	../libgnome/gnome-defs.h gnome-messagebox.h
+gnome-pixmap.o gnome-pixmap.lo: gnome-pixmap.c ../libgnome/gnome-defs.h \
+	gnome-messagebox.h
 gnome-properties.o gnome-properties.lo: gnome-properties.c \
 	../libgnome/gnome-defs.h gnome-properties.h gnome-actionarea.h
 
diff -uNr gnome-0.6/libgnomeui/gnome-pixmap.c gnome-0.7/libgnomeui/gnome-pixmap.c
--- gnome-0.6/libgnomeui/gnome-pixmap.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/libgnomeui/gnome-pixmap.c	Wed Oct  1 12:41:22 1997
@@ -0,0 +1,26 @@
+/* GNOME GUI Library
+ * Copyright (C) 1997 the Free Software Foundation
+ *
+ * Author: Miguel de Icaza
+ */
+
+#include "libgnome/gnome-defs.h"
+#include "gnome-messagebox.h"
+#include <gtk/gtk.h>
+
+GtkWidget *
+gnome_create_pixmap_widget (GtkWidget *window, GtkWidget *holder, char *file)
+{
+	GtkStyle  *style;
+	GtkWidget *pixmap_widget;
+	GdkPixmap *pixmap;
+	GdkBitmap *mask;
+
+	style = holder ? gtk_widget_get_style (holder) : 0;
+	pixmap = gdk_pixmap_create_from_xpm (window->window, &mask,
+					     &style->bg [GTK_STATE_NORMAL],
+					     file);
+	pixmap_widget = gtk_pixmap_new (pixmap, mask);
+	return pixmap_widget;
+}
+
diff -uNr gnome-0.6/libgnomeui/gnome-pixmap.h gnome-0.7/libgnomeui/gnome-pixmap.h
--- gnome-0.6/libgnomeui/gnome-pixmap.h	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/libgnomeui/gnome-pixmap.h	Wed Oct  1 12:41:53 1997
@@ -0,0 +1,11 @@
+
+#ifndef __GNOME_PIXMAP_H__
+#define __GNOME_PIXMAP_H__
+
+BEGIN_GNOME_DECLS
+
+GtkWidget *gnome_create_pixmap_widget (GtkWidget *window, GtkWidget *holder, char *file);
+
+END_GNOME_DECLS
+
+#endif /* __GNOME_PIXMAP_H__ */
diff -uNr gnome-0.6/libgnomeui/gnome-properties.c gnome-0.7/libgnomeui/gnome-properties.c
--- gnome-0.6/libgnomeui/gnome-properties.c	Wed Sep 24 18:24:46 1997
+++ gnome-0.7/libgnomeui/gnome-properties.c	Thu Oct  2 22:33:27 1997
@@ -48,8 +48,10 @@
 {
 	int (*cb)(GnomePropertyRequest);
 
-	cb = (int (*)(GnomePropertyRequest))(g_list_nth (th->props,
-							 gtk_notebook_current_page (th->notebook))->data);
+	cb = (int (*)(GnomePropertyRequest))
+		(g_list_nth
+		 (th->props,
+		  gtk_notebook_current_page (GTK_NOTEBOOK (th->notebook)))->data);
 
 
 	// printf ("request %d %x\n", gtk_notebook_current_page (th->notebook), cb);
diff -uNr gnome-0.6/libgnomeui/gnome-properties.h gnome-0.7/libgnomeui/gnome-properties.h
--- gnome-0.6/libgnomeui/gnome-properties.h	Wed Sep 24 18:24:46 1997
+++ gnome-0.7/libgnomeui/gnome-properties.h	Thu Oct  2 22:33:27 1997
@@ -11,7 +11,9 @@
 
 /* This is the first parameter to the callback function */
 typedef enum {
-	GNOME_PROPERTY_APPLY
+	GNOME_PROPERTY_READ,
+	GNOME_PROPERTY_WRITE,
+	GNOME_PROPERTY_APPLY,
 } GnomePropertyRequest;
 
 GnomePropertyConfigurator *gnome_property_configurator_new     (void);
diff -uNr gnome-0.6/libgnomeui/libgnomeui.h gnome-0.7/libgnomeui/libgnomeui.h
--- gnome-0.6/libgnomeui/libgnomeui.h	Wed Sep 24 18:24:46 1997
+++ gnome-0.7/libgnomeui/libgnomeui.h	Wed Oct  1 19:13:55 1997
@@ -4,6 +4,8 @@
 #include "libgnome/gnome-defs.h"
 #include "libgnomeui/gnome-colors.h"
 #include "libgnomeui/gnome-color-selector.h"
+#include "libgnomeui/gnome-messagebox.h"
+#include "libgnomeui/gnome-pixmap.h"
 
 BEGIN_GNOME_DECLS
 
diff -uNr gnome-0.6/po/cat-id-tbl.c gnome-0.7/po/cat-id-tbl.c
--- gnome-0.6/po/cat-id-tbl.c	Wed Sep 24 18:24:47 1997
+++ gnome-0.7/po/cat-id-tbl.c	Thu Oct  2 22:33:27 1997
@@ -14,26 +14,28 @@
   {"Vertical", 5},
   {"Horizontal", 6},
   {"Wallpaper", 7},
-  {" Background ", 8},
-  {"Settings", 9},
-  {"Wait", 10},
-  {"min", 11},
-  {"requires password", 12},
-  {"Priority", 13},
-  {"normal", 14},
-  {"low", 15},
-  {"Screen savers", 16},
-  {"Setup", 17},
-  {"Test", 18},
-  {" Screen saver ", 19},
-  {"  Ok  ", 20},
-  {" Apply ", 21},
-  {" Cancel ", 22},
-  {" Defaults ", 23},
-  {" Mode ", 24},
-  {" XLockMore ", 25},
-  {" Options ", 26},
-  {" Preview ", 27},
+  {"tiled", 8},
+  {"centered", 9},
+  {" Background ", 10},
+  {"Settings", 11},
+  {"Wait", 12},
+  {"min", 13},
+  {"requires password", 14},
+  {"Priority", 15},
+  {"normal", 16},
+  {"low", 17},
+  {"Screen savers", 18},
+  {"Setup", 19},
+  {"Test", 20},
+  {" Screen saver ", 21},
+  {"  Ok  ", 22},
+  {" Apply ", 23},
+  {" Cancel ", 24},
+  {" Defaults ", 25},
+  {" Mode ", 26},
+  {" XLockMore ", 27},
+  {" Options ", 28},
+  {" Preview ", 29},
 };
 
-int _msg_tbl_length = 27;
+int _msg_tbl_length = 29;
diff -uNr gnome-0.6/po/gnome.pot gnome-0.7/po/gnome.pot
--- gnome-0.6/po/gnome.pot	Mon Sep 29 13:04:27 1997
+++ gnome-0.7/po/gnome.pot	Thu Oct  2 23:02:11 1997
@@ -1,36 +1,44 @@
 msgid ""
 msgstr ""
-"Date: 1997-09-29 13:04:27-0500\n"
-"From: Federico Mena <federico@bananoid.nuclecu.unam.mx>\n"
+"Date: 1997-10-02 23:02:11-0500\n"
+"From: Miguel de Icaza,computo,622-4680 <miguel@bananoid.nuclecu.unam.mx>\n"
 "Content-Type: text/plain; charset=\n"
 "Xgettext-Options: --default-domain=gnome --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
 "Files: programs/desktop-properties/property-background.c programs/desktop-properties/property-screensaver.cc programs/desktop-properties/xlockmore.cc\n"
 
-#: programs/desktop-properties/property-background.c:198
+#: programs/desktop-properties/property-background.c:199
 msgid "Color"
 msgstr ""
 
-#: programs/desktop-properties/property-background.c:220
+#: programs/desktop-properties/property-background.c:223
 msgid "Flat"
 msgstr ""
 
-#: programs/desktop-properties/property-background.c:229
+#: programs/desktop-properties/property-background.c:232
 msgid "Gradient"
 msgstr ""
 
-#: programs/desktop-properties/property-background.c:250
+#: programs/desktop-properties/property-background.c:253
 msgid "Vertical"
 msgstr ""
 
-#: programs/desktop-properties/property-background.c:262
+#: programs/desktop-properties/property-background.c:265
 msgid "Horizontal"
 msgstr ""
 
-#: programs/desktop-properties/property-background.c:282
+#: programs/desktop-properties/property-background.c:291
 msgid "Wallpaper"
 msgstr ""
 
-#: programs/desktop-properties/property-background.c:343
+#: programs/desktop-properties/property-background.c:293
+msgid "tiled"
+msgstr ""
+
+#: programs/desktop-properties/property-background.c:299
+msgid "centered"
+msgstr ""
+
+#: programs/desktop-properties/property-background.c:510
 msgid " Background "
 msgstr ""
 
diff -uNr gnome-0.6/programs/Makefile.am gnome-0.7/programs/Makefile.am
--- gnome-0.6/programs/Makefile.am	Thu Sep 25 13:34:14 1997
+++ gnome-0.7/programs/Makefile.am	Thu Oct  2 22:33:28 1997
@@ -1 +1 @@
-SUBDIRS = desktop-properties network-utilities gmix cromagnon
+SUBDIRS = desktop-properties network-utilities gmix cromagnon panel
diff -uNr gnome-0.6/programs/Makefile.in gnome-0.7/programs/Makefile.in
--- gnome-0.6/programs/Makefile.in	Tue Sep 30 00:39:42 1997
+++ gnome-0.7/programs/Makefile.in	Fri Oct  3 01:04:30 1997
@@ -83,7 +83,7 @@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-SUBDIRS = desktop-properties network-utilities gmix cromagnon
+SUBDIRS = desktop-properties network-utilities gmix cromagnon panel
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -uNr gnome-0.6/programs/cromagnon/Cromagnon.desktop gnome-0.7/programs/cromagnon/Cromagnon.desktop
--- gnome-0.6/programs/cromagnon/Cromagnon.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/cromagnon/Cromagnon.desktop	Wed Oct  1 20:43:08 1997
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Exec=cromagnon
+Icon=gnome-cromagnon.xpm
+Info=Personal crontab manager
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/programs/cromagnon/Makefile.am gnome-0.7/programs/cromagnon/Makefile.am
--- gnome-0.6/programs/cromagnon/Makefile.am	Thu Sep 25 13:36:29 1997
+++ gnome-0.7/programs/cromagnon/Makefile.am	Wed Oct  1 19:02:19 1997
@@ -6,4 +6,8 @@
 	sed -e "s#@GNOMEG@#$(GNOMEG)#" -e "s#@MYVERSION@#$(VERSION)#"<$< >$@
 	chmod +x $@
 
-EXTRA_DIST = cromagnon.scm
+EXTRA_DIST = cromagnon.scm Cromagnon.desktop
+
+install-data-local:
+	cp $(srcdir)/Cromagnon.desktop $(datadir)/apps/Utilities
+
diff -uNr gnome-0.6/programs/cromagnon/Makefile.in gnome-0.7/programs/cromagnon/Makefile.in
--- gnome-0.6/programs/cromagnon/Makefile.in	Tue Sep 30 00:39:49 1997
+++ gnome-0.7/programs/cromagnon/Makefile.in	Fri Oct  3 01:04:35 1997
@@ -87,7 +87,7 @@
 
 bin_SCRIPTS = cromagnon
 
-EXTRA_DIST = cromagnon.scm
+EXTRA_DIST = cromagnon.scm Cromagnon.desktop
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -152,7 +152,7 @@
 install-exec: install-binSCRIPTS
 	@$(NORMAL_INSTALL)
 
-install-data: 
+install-data: install-data-local
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
@@ -203,6 +203,9 @@
 cromagnon: cromagnon.scm Makefile
 	sed -e "s#@GNOMEG@#$(GNOMEG)#" -e "s#@MYVERSION@#$(VERSION)#"<$< >$@
 	chmod +x $@
+
+install-data-local:
+	cp $(srcdir)/Cromagnon.desktop $(datadir)/apps/Utilities
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr gnome-0.6/programs/cromagnon/cromagnon.scm gnome-0.7/programs/cromagnon/cromagnon.scm
--- gnome-0.6/programs/cromagnon/cromagnon.scm	Thu Sep 25 13:36:48 1997
+++ gnome-0.7/programs/cromagnon/cromagnon.scm	Wed Oct  1 20:36:30 1997
@@ -1,4 +1,4 @@
-#!@GNOMEG@
+#!@GNOMEG@ -s
 ;; -*- scheme -*-
 !#
 
diff -uNr gnome-0.6/programs/desktop-properties/Makefile.am gnome-0.7/programs/desktop-properties/Makefile.am
--- gnome-0.6/programs/desktop-properties/Makefile.am	Wed Sep 24 18:24:52 1997
+++ gnome-0.7/programs/desktop-properties/Makefile.am	Fri Oct  3 00:33:57 1997
@@ -14,15 +14,19 @@
 	xlockmore.cc		\
 	xlockmore.h		\
 	xlockparse.ll		\
-	gtkpreviewextra.c	\
-	gtkpreviewextra.h	\
 	gnome-desktop.h		\
 	screensaver.h		\
 	ghash.c			\
-	ghash.h
+	ghash.h			\
+	gdkx.h
 
 desktop_properties_LDADD = \
 	$(top_builddir)/libgnome/libgnome.la		\
 	$(top_builddir)/libgnomeui/libgnomeui.la 	\
         $(X_LIBS)					\
 	@LEXLIB@
+
+EXTRA_DIST = desktop_properties.desktop
+
+install-data-local:
+	cp $(srcdir)/desktop_properties.desktop $(datadir)/apps/System/"Desktop Properties.desktop"
diff -uNr gnome-0.6/programs/desktop-properties/Makefile.in gnome-0.7/programs/desktop-properties/Makefile.in
--- gnome-0.6/programs/desktop-properties/Makefile.in	Tue Sep 30 00:39:44 1997
+++ gnome-0.7/programs/desktop-properties/Makefile.in	Fri Oct  3 01:04:32 1997
@@ -99,18 +99,19 @@
 	xlockmore.cc		\
 	xlockmore.h		\
 	xlockparse.ll		\
-	gtkpreviewextra.c	\
-	gtkpreviewextra.h	\
 	gnome-desktop.h		\
 	screensaver.h		\
 	ghash.c			\
-	ghash.h
+	ghash.h			\
+	gdkx.h
 
 desktop_properties_LDADD = \
 	$(top_builddir)/libgnome/libgnome.la		\
 	$(top_builddir)/libgnomeui/libgnomeui.la 	\
         $(X_LIBS)					\
 	@LEXLIB@
+
+EXTRA_DIST = desktop_properties.desktop
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -124,8 +125,7 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 desktop_properties_OBJECTS =  main.o property-background.o \
-property-screensaver.o xlockmore.o xlockparse.o gtkpreviewextra.o \
-ghash.o
+property-screensaver.o xlockmore.o xlockparse.o ghash.o
 desktop_properties_DEPENDENCIES =  $(top_builddir)/libgnome/libgnome.la \
 $(top_builddir)/libgnomeui/libgnomeui.la
 desktop_properties_LDFLAGS = 
@@ -258,13 +258,17 @@
 	../../libgnome/gnome-util.h ../../libgnome/gnome-hook.h \
 	../../libgnome/gnome-config.h ../../libgnome/gnome-dns.h \
 	../../libgnomeui/libgnomeui.h ../../libgnomeui/gnome-colors.h \
-	../../libgnomeui/gnome-color-selector.h gtkpreviewextra.h
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h gtkpreviewextra.h
 main.o main.lo: main.c ../../gnome.h ../../libgnome/libgnome.h \
 	../../libgnome/gnome-defs.h ../../libgnome/gnome-util.h \
 	../../libgnome/gnome-hook.h ../../libgnome/gnome-config.h \
 	../../libgnome/gnome-dns.h ../../libgnomeui/libgnomeui.h \
 	../../libgnomeui/gnome-colors.h \
-	../../libgnomeui/gnome-color-selector.h gnome-desktop.h \
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h gnome-desktop.h \
 	../../libgnomeui/gnome-properties.h
 property-background.o property-background.lo: property-background.c \
 	../../gnome.h ../../libgnome/libgnome.h \
@@ -272,8 +276,10 @@
 	../../libgnome/gnome-hook.h ../../libgnome/gnome-config.h \
 	../../libgnome/gnome-dns.h ../../libgnomeui/libgnomeui.h \
 	../../libgnomeui/gnome-colors.h \
-	../../libgnomeui/gnome-color-selector.h gnome-desktop.h \
-	../../libgnomeui/gnome-properties.h gtkpreviewextra.h
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h gnome-desktop.h \
+	../../libgnomeui/gnome-properties.h gdkx.h
 property-screensaver.o property-screensaver.lo: property-screensaver.cc \
 	property-screensaver.h screensaver.h ghash.h xlockmore.h \
 	../../gnome.h ../../libgnome/libgnome.h \
@@ -281,7 +287,9 @@
 	../../libgnome/gnome-hook.h ../../libgnome/gnome-config.h \
 	../../libgnome/gnome-dns.h ../../libgnomeui/libgnomeui.h \
 	../../libgnomeui/gnome-colors.h \
-	../../libgnomeui/gnome-color-selector.h gnome-desktop.h \
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h gnome-desktop.h \
 	../../libgnomeui/gnome-properties.h
 xlockmore.o xlockmore.lo: xlockmore.cc xlockmore.h screensaver.h ghash.h \
 	gnome-desktop.h ../../gnome.h ../../libgnome/libgnome.h \
@@ -290,6 +298,8 @@
 	../../libgnome/gnome-dns.h ../../libgnomeui/libgnomeui.h \
 	../../libgnomeui/gnome-colors.h \
 	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h \
 	../../libgnomeui/gnome-properties.h
 xlockparse.o xlockparse.lo: xlockparse.cc xlockmore.h screensaver.h \
 	ghash.h
@@ -302,7 +312,7 @@
 install-exec: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 
-install-data: 
+install-data: install-data-local
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
@@ -360,6 +370,9 @@
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+
+install-data-local:
+	cp $(srcdir)/desktop_properties.desktop $(datadir)/apps/System/"Desktop Properties.desktop"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr gnome-0.6/programs/desktop-properties/desktop_properties.desktop gnome-0.7/programs/desktop-properties/desktop_properties.desktop
--- gnome-0.6/programs/desktop-properties/desktop_properties.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/desktop-properties/desktop_properties.desktop	Wed Oct  1 19:03:46 1997
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Exec=desktop_properties
+Icon=desktop_properties.xpm
+Info=Desktop Properties
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/programs/desktop-properties/gdkx.h gnome-0.7/programs/desktop-properties/gdkx.h
--- gnome-0.6/programs/desktop-properties/gdkx.h	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/desktop-properties/gdkx.h	Thu Oct  2 22:33:28 1997
@@ -0,0 +1,44 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __GDK_X_H__
+#define __GDK_X_H__
+
+
+#include <gdk/gdkprivate.h>
+
+
+#define GDK_ROOT_WINDOW()             gdk_root_window
+#define GDK_DISPLAY()                 gdk_display
+#define GDK_WINDOW_XDISPLAY(win)      (((GdkWindowPrivate*) win)->xdisplay)
+#define GDK_WINDOW_XWINDOW(win)       (((GdkWindowPrivate*) win)->xwindow)
+#define GDK_IMAGE_XDISPLAY(image)     (((GdkImagePrivate*) image)->xdisplay)
+#define GDK_IMAGE_XIMAGE(image)       (((GdkImagePrivate*) image)->ximage)
+#define GDK_GC_XDISPLAY(gc)           (((GdkGCPrivate*) gc)->xdisplay)
+#define GDK_GC_XGC(gc)                (((GdkGCPrivate*) gc)->xgc)
+#define GDK_COLORMAP_XDISPLAY(cmap)   (((GdkColormapPrivate*) cmap)->xdisplay)
+#define GDK_COLORMAP_XCOLORMAP(cmap)  (((GdkColormapPrivate*) cmap)->xcolormap)
+#define GDK_VISUAL_XVISUAL(vis)       (((GdkVisualPrivate*) vis)->xvisual)
+#define GDK_FONT_XDISPLAY(font)       (((GdkFontPrivate*) font)->xdisplay)
+#define GDK_FONT_XFONT(font)          (((GdkFontPrivate*) font)->xfont)
+
+
+GdkVisual*   gdkx_visual_get   (VisualID xvisualid);
+GdkColormap* gdkx_colormap_get (Colormap xcolormap);
+
+
+#endif /* __GDK_X_H__ */
diff -uNr gnome-0.6/programs/desktop-properties/gnome-desktop.h gnome-0.7/programs/desktop-properties/gnome-desktop.h
--- gnome-0.6/programs/desktop-properties/gnome-desktop.h	Wed Sep 24 18:24:56 1997
+++ gnome-0.7/programs/desktop-properties/gnome-desktop.h	Thu Oct  2 22:33:28 1997
@@ -10,7 +10,7 @@
 			 int (*callback)(GnomePropertyRequest));
 
 #define GNOME_MONITOR_WIDGET_X 20
-#define GNOME_MONITOR_WIDGET_Y 16
+#define GNOME_MONITOR_WIDGET_Y 10
 #define GNOME_MONITOR_WIDGET_WIDTH 157
 #define GNOME_MONITOR_WIDGET_HEIGHT 111
 
diff -uNr gnome-0.6/programs/desktop-properties/gtkpreviewextra.c gnome-0.7/programs/desktop-properties/gtkpreviewextra.c
--- gnome-0.6/programs/desktop-properties/gtkpreviewextra.c	Wed Sep 24 18:24:58 1997
+++ gnome-0.7/programs/desktop-properties/gtkpreviewextra.c	Wed Dec 31 18:00:00 1969
@@ -1,267 +0,0 @@
-#include <string.h>
-#include <gtk/gtk.h>
-#include "gnome.h"
-#include "gtkpreviewextra.h"
-
-/* FIXME FIXME FIXME FIXME PLEASE FOR YOUR LIFE
- *
- * This file is extremely ugly.  It copies an important part of
- * gtkpreview.c to add a single function that is missing in Gtk and
- * that would be nice to have.  We don't want to change the GTK API
- * yet, so this is why this mess is here.
- */
-
-#define IMAGE_SIZE            256
-#define COLOR_COMPOSE(r,g,b)  (lookup_red[r] | lookup_green[g] | lookup_blue[b])
-
-typedef void (*GtkTransferFunc) (guchar *dest, guchar *src, gint count);
-
-static GdkImage *preview_class_image;
-
-static void
-gtk_lsbmsb_1_1 (guchar *dest,
-		guchar *src,
-		gint    count)
-{
-  memcpy (dest, src, count);
-}
-
-static void
-gtk_lsb_2_2 (guchar *dest,
-	     guchar *src,
-	     gint    count)
-{
-  memcpy (dest, src, count * 2);
-}
-
-static void
-gtk_msb_2_2 (guchar *dest,
-	     guchar *src,
-	     gint    count)
-{
-  while (count--)
-    {
-      dest[0] = src[1];
-      dest[1] = src[0];
-      dest += 2;
-      src += 2;
-    }
-}
-
-static void
-gtk_lsb_3_3 (guchar *dest,
-	     guchar *src,
-	     gint    count)
-{
-  memcpy (dest, src, count * 3);
-}
-
-static void
-gtk_msb_3_3 (guchar *dest,
-	     guchar *src,
-	     gint    count)
-{
-  while (count--)
-    {
-      dest[0] = src[2];
-      dest[1] = src[1];
-      dest[2] = src[0];
-      dest += 3;
-      src += 3;
-    }
-}
-
-static void
-gtk_lsb_3_4 (guchar *dest,
-	     guchar *src,
-	     gint    count)
-{
-  while (count--)
-    {
-      dest[0] = src[0];
-      dest[1] = src[1];
-      dest[2] = src[2];
-      dest += 4;
-      src += 3;
-    }
-}
-
-static void
-gtk_msb_3_4 (guchar *dest,
-	     guchar *src,
-	     gint    count)
-{
-  while (count--)
-    {
-      dest[1] = src[2];
-      dest[2] = src[1];
-      dest[3] = src[0];
-      dest += 4;
-      src += 3;
-    }
-}
-
-void
-gtk_preview_put_with_offsets (GtkPreview   *preview,
-			      GdkWindow    *window,
-			      GdkGC        *gc,
-			      gint          srcx,
-			      gint          srcy,
-			      gint          destx,
-			      gint          desty,
-			      gint          width,
-			      gint          height)
-{
-  GtkWidget *widget;
-  GdkImage *image;
-  gint w, h;
-  GdkRectangle origin, rt;
-  GdkRectangle r1, r2, r3;
-  GtkTransferFunc transfer_func;
-  guchar *image_mem;
-  guchar *src, *dest;
-  gint x, xe, x2;
-  gint y, ye, y2;
-  guint dest_rowstride;
-  guint src_bpp;
-  guint dest_bpp;
-  gint i;
-
-  g_return_if_fail (preview != NULL);
-  g_return_if_fail (GTK_IS_PREVIEW (preview));
-  g_return_if_fail (window != NULL);
-
-  if (!preview->buffer)
-    return;
-
-  widget = GTK_WIDGET (preview);
-
-  if ((srcx < 0) || (srcy < 0) ||
-      (srcx >= preview->buffer_width) || (srcy >= preview->buffer_height))
-    return;
-
-  origin.x = 0;
-  origin.y = 0;
-  origin.width = preview->buffer_width;
-  origin.height = preview->buffer_height;
-
-  r1.x = srcx;
-  r1.y = srcy;
-  r1.width = width;
-  r1.height = height;
-
-  if (!gdk_rectangle_intersect(&origin, &r1, &rt))
-    return;
-
-  rt.x += destx;
-  rt.y += desty;
-
-  gdk_window_get_size(window, &w, &h);
-
-  r2.x = 0;
-  r2.y = 0;
-  r2.width = w;
-  r2.height = h;
-
-  if (!gdk_rectangle_intersect(&rt, &r2, &r3))
-    return;
-
-  x2 = r3.x + r3.width;
-  y2 = r3.y + r3.height;
-
-  if (!preview_class_image)
-    preview_class_image = gdk_image_new (GDK_IMAGE_FASTEST,
-					 gtk_preview_get_visual(),
-					 IMAGE_SIZE, IMAGE_SIZE);
-  image = preview_class_image;
-  src_bpp = gtk_preview_get_info()->bpp;
-
-  image_mem = image->mem;
-  dest_bpp = image->bpp;
-  dest_rowstride = image->bpl;
-
-  transfer_func = NULL;
-
-  switch (dest_bpp)
-    {
-    case 1:
-      switch (src_bpp)
-	{
-	case 1:
-	  transfer_func = gtk_lsbmsb_1_1;
-	  break;
-	}
-      break;
-    case 2:
-      switch (src_bpp)
-	{
-	case 2:
-	  if (image->byte_order == GDK_MSB_FIRST)
-	    transfer_func = gtk_msb_2_2;
-	  else
-	    transfer_func = gtk_lsb_2_2;
-	  break;
-	case 3:
-	  break;
-	}
-      break;
-    case 3:
-      switch (src_bpp)
-	{
-	case 3:
-	  if (image->byte_order == GDK_MSB_FIRST)
-	    transfer_func = gtk_msb_3_3;
-	  else
-	    transfer_func = gtk_lsb_3_3;
-	  break;
-	}
-      break;
-    case 4:
-      switch (src_bpp)
-	{
-	case 3:
-	  if (image->byte_order == GDK_MSB_FIRST)
-	    transfer_func = gtk_msb_3_4;
-	  else
-	    transfer_func = gtk_lsb_3_4;
-	  break;
-	}
-      break;
-    }
-
-  if (!transfer_func)
-    {
-      g_warning ("unsupported byte order/src bpp/dest bpp combination: %s:%d:%d",
-		 (image->byte_order == GDK_MSB_FIRST) ? "msb" : "lsb", src_bpp, dest_bpp);
-      return;
-    }
-
-  for (y = r3.y; y < y2; y += IMAGE_SIZE)
-    {
-      for (x = r3.x; x < x2; x += IMAGE_SIZE)
-	{
-	  xe = x + IMAGE_SIZE;
-	  if (xe > x2)
-	    xe = x2;
-
-	  ye = y + IMAGE_SIZE;
-	  if (ye > y2)
-	    ye = y2;
-
-	  for (i = y; i < ye; i++)
-	    {
-	      src = preview->buffer + (((gulong) (i - r3.y + r1.y) * (gulong) preview->buffer_width) +
-				       (x - r3.x + r1.x)) * (gulong) src_bpp;
-	      dest = image_mem + ((gulong) (i - y) * dest_rowstride);
-
-	      if (xe > x)
-		(* transfer_func) (dest, src, xe - x);
-	    }
-
-	  gdk_draw_image (window, gc,
-			  image, 0, 0, x, y,
-			  xe - x, ye - y);
-	  gdk_flush ();
-	}
-    }
-}
diff -uNr gnome-0.6/programs/desktop-properties/gtkpreviewextra.h gnome-0.7/programs/desktop-properties/gtkpreviewextra.h
--- gnome-0.6/programs/desktop-properties/gtkpreviewextra.h	Wed Sep 24 18:24:58 1997
+++ gnome-0.7/programs/desktop-properties/gtkpreviewextra.h	Wed Dec 31 18:00:00 1969
@@ -1,20 +0,0 @@
-#ifndef GTK_PREVIEW_EXTRA_H
-#define GTK_PREVIEW_EXTRA_H
-
-BEGIN_GNOME_DECLS
-
-void
-gtk_preview_put_with_offsets (GtkPreview   *preview,
-			      GdkWindow    *window,
-			      GdkGC        *gc,
-			      gint          srcx,
-			      gint          srcy,
-			      gint          destx,
-			      gint          desty,
-			      gint          width,
-			      gint          height);
-
-
-END_GNOME_DECLS
-
-#endif
diff -uNr gnome-0.6/programs/desktop-properties/main.c gnome-0.7/programs/desktop-properties/main.c
--- gnome-0.6/programs/desktop-properties/main.c	Wed Sep 24 18:25:01 1997
+++ gnome-0.7/programs/desktop-properties/main.c	Thu Oct  2 22:33:28 1997
@@ -77,6 +77,7 @@
 display_properties_action (GtkWidget *w, gint close)
 {
 	gnome_property_configurator_request (display_config, GNOME_PROPERTY_APPLY);
+	gnome_property_configurator_request (display_config, GNOME_PROPERTY_WRITE);
 	gnome_config_sync ();
 
 	if (close)
diff -uNr gnome-0.6/programs/desktop-properties/property-background.c gnome-0.7/programs/desktop-properties/property-background.c
--- gnome-0.6/programs/desktop-properties/property-background.c	Wed Sep 24 18:25:06 1997
+++ gnome-0.7/programs/desktop-properties/property-background.c	Thu Oct  2 22:33:28 1997
@@ -5,18 +5,40 @@
 
 #include "gnome.h"
 #include "gnome-desktop.h"
-#include "gtkpreviewextra.h"
+#include "gdkx.h"
 
 #define _(String) gettext(String)
 
+static GtkWidget *screen;
+static GtkWidget *preview;
+
 static GtkWidget *frame;
 static GtkWidget *monitor;
+static GtkWidget *vbox;
 
 /* If true, the display is a gradient from color1..color2 */
-static int grad = FALSE;
+static gint grad;
 
 /* Direction of the gradient */
-static int vertical = TRUE;
+static gint vertical;
+
+static gint bgType;
+static gint wpType;
+
+static gchar *wpFileName;
+
+enum {
+	WALLPAPER_TILED,
+	WALLPAPER_CENTERED,
+};
+
+enum {
+	BACKGROUND_SIMPLE,
+	BACKGROUND_WALLPAPER,
+};
+
+
+static GdkColor  bgColor1, bgColor2;
 
 /* The pointers to the color selectors */
 static GnomeColorSelector *cs1, *cs2;
@@ -52,18 +74,19 @@
 	gtk_widget_set_sensitive(dest, GTK_TOGGLE_BUTTON(widget)->active);
 } /* radio_toggle_widget_active */
 
-GtkWidget *
-create_gradient (int width, int height, int r0, int g0, int b0, int r1, int g1, int b1, int vertical)
+static void
+gnome_preview_fill_gradient (GtkPreview *pr,
+		 GdkColor *c1, GdkColor *c2,
+		 int vertical)
 {
-	GtkWidget *preview;
 	guchar    *gbuf, *buf;
 	guchar    *s, *p;
 	int        i, j;
 	int        gsize;
+	gint width = GTK_WIDGET (pr)->requisition.width;
+	gint height = GTK_WIDGET (pr)->requisition.height;
 
-	preview = gtk_preview_new(GTK_PREVIEW_COLOR);
-	gtk_preview_size(GTK_PREVIEW(preview), width, height);
-
+	
 	if (vertical) {
 		gbuf = g_malloc(height * 3 * sizeof(guchar));
 		buf  = g_malloc(width * 3 * sizeof(guchar));
@@ -81,9 +104,9 @@
 	p = gbuf;
 
 	for (i = 0; i < gsize; i++) {
-		*p++ = r0 + i * (r1 - r0) / (gsize - 1);
-		*p++ = g0 + i * (g1 - g0) / (gsize - 1);
-		*p++ = b0 + i * (b1 - b0) / (gsize - 1);
+		*p++ = (c1->red + i * (c2->red - c1->red) / (gsize - 1)) >> 8;
+		*p++ = (c1->green + i * (c2->green - c1->green) / (gsize - 1)) >> 8;
+		*p++ = (c1->blue + i * (c2->blue - c1->blue) / (gsize - 1)) >> 8;
 	}
 
 	/* Fill preview */
@@ -99,72 +122,51 @@
 				*p++ = s[2];
 			}
 
-			gtk_preview_draw_row(GTK_PREVIEW(preview), buf, 0, i, width);
+			gtk_preview_draw_row(GTK_PREVIEW(pr), buf, 0, i, width);
 		}
 	else
 		for (i = 0; i < height; i++)
-			gtk_preview_draw_row(GTK_PREVIEW(preview), gbuf, 0, i, width);
+			gtk_preview_draw_row(GTK_PREVIEW(pr), gbuf, 0, i, width);
 
 	g_free(gbuf);
 	g_free(buf);
-
-	return preview;
 }
 
 static void
 set_gradient (void)
 {
-	GtkWidget *preview;
-	int        r0, g0, b0;
-	int        r1, g1, b1;
-
-	gnome_color_selector_get_color_int(cs1, &r0, &g0, &b0, 255);
-	gnome_color_selector_get_color_int(cs2, &r1, &g1, &b1, 255);
-
-	preview = create_gradient (157, 111, r0, g0, b0, r1, g1, b1, vertical);
-	
-	gtk_preview_put_with_offsets (GTK_PREVIEW (preview),
-				      GTK_PIXMAP(monitor)->pixmap,
-				      monitor->style->black_gc,
-				      0, 0,
-				      20, 10,
-				      157, 111);
-
-	gtk_widget_destroy(preview);
-	gtk_widget_draw(monitor, NULL);
+	gnome_preview_fill_gradient (GTK_PREVIEW (preview),
+				     &bgColor1, &bgColor2, vertical);
 }
 
 static void
 set_solid (void)
 {
-	/* FIXME: this is a super-ugly hack! */
-
-	GtkWidget *preview;
-	int        r0, g0, b0;
-	int        r1, g1, b1;
-
-	gnome_color_selector_get_color_int(cs1, &r0, &g0, &b0, 255);
-
-	preview = create_gradient (157, 111, r0, g0, b0, r0, g0, b0, vertical);
-	
-	gtk_preview_put_with_offsets (GTK_PREVIEW (preview),
-				      GTK_PIXMAP(monitor)->pixmap,
-				      monitor->style->black_gc,
-				      0, 0,
-				      20, 10,
-				      157, 111);
-
-	gtk_widget_destroy(preview);
-	gtk_widget_draw(monitor, NULL);
+	gnome_preview_fill_gradient (GTK_PREVIEW (preview),
+				     &bgColor1, &bgColor1, vertical);
 }
 
 static void
 fill_monitor (void)
 {
-	if (!grad)
-		set_solid ();
-	else
+	gint r, g, b;
+
+	gnome_color_selector_get_color_int(cs1, &r, &g, &b, 65535);
+	bgColor1.red = r;
+	bgColor1.green = g;
+	bgColor1.blue = b;
+	gnome_color_selector_get_color_int(cs2, &r, &g, &b, 65535);
+	bgColor2.red = r;
+	bgColor2.green = g;
+	bgColor2.blue = b;
+	
+	if (grad)
 		set_gradient();
+	else
+		set_solid ();
+
+	if (GTK_WIDGET_DRAWABLE (preview))
+		gtk_widget_draw (preview, NULL);
 }
 
 static void
@@ -193,7 +195,6 @@
 	GtkWidget *radio1;
 	GtkWidget *radio2;
 	GtkWidget *vb1, *vb2;
-	GdkColor  color1, color2;
 	
 	frame = gtk_frame_new (_("Color"));
 	gtk_widget_show (frame);
@@ -209,9 +210,11 @@
 	gtk_container_add (GTK_CONTAINER(frame), table);
 	gtk_widget_show (table);
 
-	cs1 = gnome_color_selector_new((SetColorFunc) fill_monitor, NULL);
-	gdk_color_parse (gnome_config_get_string ("/Desktop/Background/color1=#000000"), &color1);
-	gnome_color_selector_set_color_int (cs1, color1.red, color1.green, color1.blue, 65535);
+	cs1 = gnome_color_selector_new ((SetColorFunc) fill_monitor, NULL);
+	gnome_color_selector_set_color_int (cs1,
+					    bgColor1.red,
+					    bgColor1.green,
+					    bgColor1.blue, 65535);
 	
 	button1 = gnome_color_selector_get_button (cs1);
 	gtk_table_attach (GTK_TABLE(table), button1, 0, 1, 0, 1, 0, 0, 0, 0);
@@ -234,10 +237,10 @@
 	gtk_widget_show(radio1);
 
 	cs2 = gnome_color_selector_new ((SetColorFunc) fill_monitor, NULL);
-	gdk_color_parse (gnome_config_get_string ("/Desktop/Background/color2=#0000ff"), &color2);
-	gnome_color_selector_set_color_int (cs2, color2.red, color2.green, color2.blue, 65535);
-
-	/* fill_monitor(); */
+	gnome_color_selector_set_color_int (cs2,
+					    bgColor2.red,
+					    bgColor2.green,
+					    bgColor2.blue, 65535);
 
 	button2 = gnome_color_selector_get_button (cs2);
 	gtk_table_attach (GTK_TABLE(table), button2, 0, 1, 1, 2, 0, 0, 0, 0);
@@ -271,6 +274,10 @@
 			    (GtkSignalFunc) radio_toggle_widget_active,
 			    radio2);
 	
+	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (radio1), grad);
+	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (radio2), !vertical);
+	fill_monitor();
+
 	return frame;
 }
 
@@ -278,28 +285,173 @@
 wallpaper_setup ()
 {
 	GtkWidget *wallp;
+	GtkWidget *vbox;
+	GtkWidget *rbut;
 
 	wallp = gtk_frame_new (_("Wallpaper"));
+	vbox = gtk_vbox_new (FALSE, 0);
+	rbut = gtk_radio_button_new_with_label (NULL, _("tiled"));
+	gtk_box_pack_start (GTK_BOX (vbox), rbut, FALSE, FALSE, 0);
+	gtk_widget_show (rbut);
+
+	rbut = gtk_radio_button_new_with_label
+		(gtk_radio_button_group (GTK_RADIO_BUTTON (rbut)),
+		 _("centered"));
+	gtk_box_pack_start (GTK_BOX (vbox), rbut, FALSE, FALSE, 0);
+
+	gtk_container_border_width (GTK_CONTAINER (vbox), GNOME_PAD);
+	gtk_container_add (GTK_CONTAINER (wallp), vbox);
+
+
+	gtk_widget_show (rbut);
+	gtk_widget_show (vbox);
 	gtk_widget_show (wallp);
+
+	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (rbut),
+				     wpType == WALLPAPER_CENTERED);
+
 	return wallp;
 }
 
+static void
+background_apply () {
+	GdkWindow *rootWindow;
+	GdkPixmap *rootBack = NULL;
+	GtkWidget *rootPreview;
+	gint rootWidth, rootHeight;
+
+	GtkWidget *op = preview;
+
+	/* gtk_widget_push_visual (gtk_preview_get_visual ());
+	gtk_widget_push_colormap (gtk_preview_get_cmap ()); */
+
+	rootWindow = gdk_window_foreign_new (GDK_ROOT_WINDOW());
+	gdk_window_get_size (rootWindow, &rootWidth, &rootHeight);
+
+	/* gnome_color_selector_get_color_int(cs1, &r0, &g0, &b0, 255);
+	gnome_color_selector_get_color_int(cs2, &r1, &g1, &b1, 255); */
+
+	if (bgType = BACKGROUND_WALLPAPER) {
+		rootBack = gdk_pixmap_create_from_xpm (rootWindow, NULL,
+						       &bgColor1, wpFileName);
+		gdk_window_set_back_pixmap (rootWindow, rootBack, FALSE);
+		gdk_pixmap_destroy (rootBack);
+	} else if (grad) {
+		rootPreview = gtk_preview_new (GTK_PREVIEW_COLOR);
+
+		gtk_preview_size (GTK_PREVIEW (rootPreview), rootWidth, rootHeight);
+
+		preview = rootPreview;
+		gnome_preview_fill_gradient (GTK_PREVIEW (rootPreview),
+					     &bgColor1, &bgColor2,
+					     vertical);
+		preview = op;
+
+		rootBack = gdk_pixmap_new (rootWindow, rootWidth, rootHeight, -1);
+		gtk_preview_put (GTK_PREVIEW (rootPreview),
+				 rootBack,
+				 monitor->style->black_gc,
+				 0, 0,
+				 0, 0,
+				 rootWidth, rootHeight);
+
+		gdk_window_set_back_pixmap (rootWindow, rootBack, FALSE);
+	
+		gdk_pixmap_destroy (rootBack);
+		gtk_widget_destroy (rootPreview);
+	} else {
+		gdk_color_alloc (gdk_window_get_colormap (rootWindow),
+				 &bgColor1);
+			 
+		gdk_window_set_background (rootWindow, &bgColor1);
+	}
+	gdk_window_clear (rootWindow);
+
+	/* gtk_widget_pop_colormap ();
+	gtk_widget_pop_visual (); */
+}
+
+static void
+background_write () {
+	char buffer [60];
+	
+	sprintf (buffer, "#%02x%02x%02x",
+		 bgColor1.red,
+		 bgColor1.green,
+		 bgColor1.blue);
+	gnome_config_set_string ("/Desktop/Background/color1", buffer);
+	sprintf (buffer, "#%02x%02x%02x",
+		 bgColor2.red,
+		 bgColor2.green,
+		 bgColor2.blue);
+	gnome_config_set_string ("/Desktop/Background/color2", buffer);
+
+	gnome_config_set_string ("/Desktop/Background/simple",
+				 (grad) ? "gradient" : "solid");
+	gnome_config_set_string ("/Desktop/Background/gradient",
+				 (vertical) ? "vertical" : "horizontal");
+
+	gnome_config_set_string ("/Desktop/Background/wallpaper",
+				 (bgType == BACKGROUND_SIMPLE) ? "none" : wpFileName);
+	gnome_config_set_string ("/Desktop/Background/wallpaperAlign",
+				 (wpType == WALLPAPER_TILED) ? "tiled" : "centered");
+}
+
+static void
+background_read () {
+	gdk_color_parse
+		(gnome_config_get_string ("/Desktop/Background/color1=#0000ff"),
+		 &bgColor1);
+	gdk_color_parse
+		(gnome_config_get_string ("/Desktop/Background/color2=#808080"),
+		 &bgColor2);
+
+	bgType = (strcasecmp
+		  (gnome_config_get_string
+		   ("/Desktop/Background/type=simple"),
+		   "simple"));
+	grad = (strcasecmp
+		(gnome_config_get_string
+		 ("/Desktop/Background/simple=solid"),
+		 "solid"));
+	vertical = !(strcasecmp
+		     (gnome_config_get_string
+		      ("/Desktop/Background/gradient=vertical"),
+		      "vertical"));
+	if ((strcasecmp
+	      (gnome_config_get_string
+	       ("/Desktop/Background/wallpaperAlign=tiled"),
+	       "tiled")))
+		wpType = WALLPAPER_CENTERED;
+	else
+		wpType = WALLPAPER_TILED;
+
+	wpFileName = gnome_config_get_string ("/Desktop/Background/wallpaper=none");
+
+	if (!strcasecmp (wpFileName, "none")) {
+		wpFileName = NULL;
+		bgType = BACKGROUND_SIMPLE;
+	} else
+		bgType = BACKGROUND_WALLPAPER;
+}
+
 static gint
 background_action (GnomePropertyRequest req)
 {
-	char buffer [60];
-	int r, g, b;
-	
-	if (req != GNOME_PROPERTY_APPLY)
+	switch (req) {
+	case GNOME_PROPERTY_READ:
+		background_read ();
+		break;
+	case GNOME_PROPERTY_WRITE:
+		background_write ();
+		break;
+	case GNOME_PROPERTY_APPLY:
+		background_apply ();
+		break;
+	default:
 		return 0;
+	}
 
-	gnome_color_selector_get_color_int (cs1, &r, &g, &b, 255);
-	sprintf (buffer, "#%02x%02x%02x", r, g, b);
-	gnome_config_set_string ("/Desktop/Background/color1", buffer);
-	gnome_color_selector_get_color_int (cs2, &r, &g, &b, 255);
-	sprintf (buffer, "#%02x%02x%02x", r, g, b);
-	gnome_config_set_string ("/Desktop/Background/color2", buffer);
-	
 	return 1;
 }
 
@@ -311,32 +463,47 @@
 void
 background_setup (GtkWidget *window)
 {
-	GtkWidget *vbox, *settings;
+	GtkWidget *settings;
 	GtkWidget *hbox;
 	GtkWidget *fill, *wallp;
 	
+	background_action (GNOME_PROPERTY_READ);
+
 	vbox = gtk_vbox_new (TRUE, 0);
 
 	hbox = gtk_hbox_new (TRUE, 0);
 	gtk_container_border_width (GTK_CONTAINER(hbox), GNOME_PAD);
 
+	screen = gtk_fixed_new ();
 	monitor = get_monitor_preview_widget (window);
+	preview = gtk_preview_new(GTK_PREVIEW_COLOR);
+
+	gtk_fixed_put (GTK_FIXED (screen), monitor, 0, 0);
+
+	gtk_preview_size(GTK_PREVIEW(preview),
+			 GNOME_MONITOR_WIDGET_WIDTH,
+			 GNOME_MONITOR_WIDGET_HEIGHT);
+	gtk_fixed_put (GTK_FIXED (screen), preview,
+		       GNOME_MONITOR_WIDGET_X,
+		       GNOME_MONITOR_WIDGET_Y);
 	
-	gtk_box_pack_start (GTK_BOX(hbox), monitor, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX(hbox), screen, FALSE, FALSE, 0);
 
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 	
-	settings = gtk_hbox_new (TRUE, GNOME_PAD);
+	settings = gtk_hbox_new (FALSE, GNOME_PAD);
 	gtk_container_border_width (GTK_CONTAINER(settings), GNOME_PAD);
 	gtk_box_pack_end (GTK_BOX (vbox), settings, TRUE, TRUE, 0);
 
 	fill = color_setup ();
-	gtk_box_pack_start (GTK_BOX (settings), fill, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (settings), fill, FALSE, FALSE, 0);
 	
 	wallp  = wallpaper_setup ();
 	gtk_box_pack_end (GTK_BOX (settings), wallp, TRUE, TRUE, 0);
 	
+	gtk_widget_show (preview);
 	gtk_widget_show (monitor);
+	gtk_widget_show (screen);
 	gtk_widget_show (settings);
 	gtk_widget_show (hbox);
 
diff -uNr gnome-0.6/programs/desktop-properties/property-screensaver.cc gnome-0.7/programs/desktop-properties/property-screensaver.cc
--- gnome-0.6/programs/desktop-properties/property-screensaver.cc	Wed Sep 24 18:25:08 1997
+++ gnome-0.7/programs/desktop-properties/property-screensaver.cc	Thu Oct  2 22:33:28 1997
@@ -189,7 +189,7 @@
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	mlist = gtk_list_new ();
 	gtk_list_set_selection_mode (GTK_LIST (mlist), GTK_SELECTION_BROWSE);
-	gtk_widget_set_usize (f, 220, -1);
+	gtk_widget_set_usize (f, 240, -1);
 	vb1 = gtk_vbox_new (FALSE, 10);
 	b1 = gtk_button_new_with_label (_("Setup"));
 	gtk_signal_connect (GTK_OBJECT (b1), "clicked",
diff -uNr gnome-0.6/programs/desktop-properties/xlockparse.cc gnome-0.7/programs/desktop-properties/xlockparse.cc
--- gnome-0.6/programs/desktop-properties/xlockparse.cc	Mon Sep 29 13:05:24 1997
+++ gnome-0.7/programs/desktop-properties/xlockparse.cc	Thu Oct  2 23:24:41 1997
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.89 96/05/25 21:02:21 vern Exp $
+ * $Header: /home/cvs/gnome/programs/desktop-properties/xlockparse.cc,v 1.2 1997/10/03 04:36:12 nobody Exp $
  */
 
 #define FLEX_SCANNER
diff -uNr gnome-0.6/programs/gmix/Makefile.am gnome-0.7/programs/gmix/Makefile.am
--- gnome-0.6/programs/gmix/Makefile.am	Wed Sep 24 18:25:20 1997
+++ gnome-0.7/programs/gmix/Makefile.am	Wed Oct  1 19:01:15 1997
@@ -14,4 +14,7 @@
 	$(top_builddir)/libgnomeui/libgnomeui.la 	\
         $(X_LIBS)
 
-EXTRA_DIST = README TODO NEWS
+EXTRA_DIST = README TODO NEWS gmix.desktop
+
+install-data-local:
+	cp $(srcdir)/gmix.desktop $(datadir)/apps/Audio
diff -uNr gnome-0.6/programs/gmix/Makefile.in gnome-0.7/programs/gmix/Makefile.in
--- gnome-0.6/programs/gmix/Makefile.in	Tue Sep 30 00:39:47 1997
+++ gnome-0.7/programs/gmix/Makefile.in	Fri Oct  3 01:04:34 1997
@@ -99,7 +99,7 @@
 	$(top_builddir)/libgnomeui/libgnomeui.la 	\
         $(X_LIBS)
 
-EXTRA_DIST = README TODO NEWS
+EXTRA_DIST = README TODO NEWS gmix.desktop
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -237,7 +237,7 @@
 install-exec: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 
-install-data: 
+install-data: install-data-local
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
@@ -295,6 +295,9 @@
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+
+install-data-local:
+	cp $(srcdir)/gmix.desktop $(datadir)/apps/Audio
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr gnome-0.6/programs/gmix/gmix.desktop gnome-0.7/programs/gmix/gmix.desktop
--- gnome-0.6/programs/gmix/gmix.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/gmix/gmix.desktop	Wed Oct  1 18:58:37 1997
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Exec=gmix
+Icon=gmix.xpm
+Info=Gnome Mixer
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/programs/network-utilities/Makefile.am gnome-0.7/programs/network-utilities/Makefile.am
--- gnome-0.6/programs/network-utilities/Makefile.am	Thu Sep 25 13:34:14 1997
+++ gnome-0.7/programs/network-utilities/Makefile.am	Fri Oct  3 00:30:16 1997
@@ -6,4 +6,7 @@
 	sed -e "s#@GNOMEG@#$(GNOMEG)#" -e "s#@MYVERSION@#$(VERSION)#"<$< >$@
 	chmod +x $@
 
-EXTRA_DIST = itools.scm
+EXTRA_DIST = itools.scm itools.desktop
+
+install-data-local:
+	cp $(srcdir)/itools.desktop $(datadir)/apps/Network/"Network Utilities.desktop"
diff -uNr gnome-0.6/programs/network-utilities/Makefile.in gnome-0.7/programs/network-utilities/Makefile.in
--- gnome-0.6/programs/network-utilities/Makefile.in	Tue Sep 30 00:39:45 1997
+++ gnome-0.7/programs/network-utilities/Makefile.in	Fri Oct  3 01:04:33 1997
@@ -87,7 +87,7 @@
 
 bin_SCRIPTS = network-utilities
 
-EXTRA_DIST = itools.scm
+EXTRA_DIST = itools.scm itools.desktop
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -152,7 +152,7 @@
 install-exec: install-binSCRIPTS
 	@$(NORMAL_INSTALL)
 
-install-data: 
+install-data: install-data-local
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
@@ -203,6 +203,9 @@
 network-utilities: itools.scm Makefile
 	sed -e "s#@GNOMEG@#$(GNOMEG)#" -e "s#@MYVERSION@#$(VERSION)#"<$< >$@
 	chmod +x $@
+
+install-data-local:
+	cp $(srcdir)/itools.desktop $(datadir)/apps/Network/"Network Utilities.desktop"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr gnome-0.6/programs/network-utilities/itools.desktop gnome-0.7/programs/network-utilities/itools.desktop
--- gnome-0.6/programs/network-utilities/itools.desktop	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/network-utilities/itools.desktop	Fri Oct  3 00:00:34 1997
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Exec=network-utilities
+Icon=gnome-network.xpm
+Info=Network utilities
+Terminal=0
+Type=Application
diff -uNr gnome-0.6/programs/network-utilities/itools.scm gnome-0.7/programs/network-utilities/itools.scm
--- gnome-0.6/programs/network-utilities/itools.scm	Fri Sep 26 12:39:03 1997
+++ gnome-0.7/programs/network-utilities/itools.scm	Wed Oct  1 17:09:24 1997
@@ -1,7 +1,6 @@
 #!@GNOMEG@ -s
 -*- scheme -*-
 !#
-
 (define (create-itools-panel useful-options-widget
 			     extended-options-widget
 			     build-command-func)
@@ -40,10 +39,10 @@
 		   (gnome-boxed-widget (gnome-make-filled-hbox
 					#f 0
 					(gnome-boxed-widget
-					 useful-options-widget #f #f 0 'start)
-					(gnome-boxed-widget details #f #f 0 'end))
-				       #f #f 0 'start)
-		   (gnome-boxed-widget extended-options-widget #f #f 4 'start)))
+					 useful-options-widget)
+					'pack-end
+					(gnome-boxed-widget details)))
+		   (gnome-boxed-widget #f #f 4 extended-options-widget)))
 	 (hadj    (gtk-adjustment-new 0.0 0.0 0.0 0.0 0.0 0.0))
 	 (vadj    (gtk-adjustment-new 0.0 0.0 0.0 0.0 0.0 0.0))
 	 (table   (gtk-table-new 2 2 #f))
@@ -57,19 +56,20 @@
 		   
 		   (gnome-boxed-widget (gnome-make-filled-hbox
 					#f 10
-					(gnome-boxed-widget host #f #f 0 'start)
-					(gnome-boxed-widget entry #t #t 0 'start)
-					(gnome-boxed-widget stop #f #f 0 'end)
-					(gnome-boxed-widget go #f #f 0 'end))
-				       #f #f 0 'start)
+					(gnome-boxed-widget host)
+					(gnome-boxed-widget entry)
+					'pack-end
+					(gnome-boxed-widget stop)
+					(gnome-boxed-widget go)))
 		   
 		   ; Useful options and details button
 		   
-		   (gnome-boxed-widget frame #f #f 4 'start)
+		   (gnome-boxed-widget #f #f 4 frame)
 		   
 		   ; Output text widget
-		   
-		   (gnome-boxed-widget table #t #t 0 'end))))
+
+		   'pack-end
+		   (gnome-boxed-widget #t #t 0 table))))
 
     (gtk-table-attach table text 0 1 0 1 '(expand fill) '(expand fill) 0 0)
     (gtk-table-attach table hsbar 0 1 1 2 '(expand fill) '() 0 0)
@@ -371,10 +371,10 @@
      (gnome-make-filled-vbox
       #f
       3
-      (gnome-boxed-widget (gtk-label-new "GNOME Network Utilities") #f #f 0 'start)
-      (gnome-boxed-widget (gtk-label-new "Version @MYVERSION@") #f #f  0 'start)
-      (gnome-boxed-widget (gtk-label-new "Federico Mena <federico@nuclecu.unam.mx>") #f #f 0 'start)
-      (gnome-boxed-widget (gtk-label-new "Miguel de Icaza <miguel@nuclecu.unam.mx>") #f #f 0 'start)))
+      (gnome-boxed-widget (gtk-label-new "GNOME Network Utilities"))
+      (gnome-boxed-widget (gtk-label-new "Version @MYVERSION@"))
+      (gnome-boxed-widget (gtk-label-new "Federico Mena <federico@nuclecu.unam.mx>"))
+      (gnome-boxed-widget (gtk-label-new "Miguel de Icaza <miguel@nuclecu.unam.mx>"))))
     (gtk-widget-show alignment)
     alignment))
 
diff -uNr gnome-0.6/programs/panel/Makefile.am gnome-0.7/programs/panel/Makefile.am
--- gnome-0.6/programs/panel/Makefile.am	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/Makefile.am	Thu Oct  2 22:33:28 1997
@@ -0,0 +1,29 @@
+
+SUBDIRS  = menu mailcheck
+
+INCLUDES = 			\
+	-I../.. 		\
+	-I$(srcdir)/../.. 	\
+	-I$(includedir)		\
+	$(X_CFLAGS)
+
+bin_PROGRAMS = panel module_test
+
+panel_SOURCES = \
+	applet.c	\
+	applet.h	\
+	main.c		\
+	panel.c		\
+	panel.h
+
+module_test_SOURCES = \
+	module_test.c 
+
+MYLIBS = \
+	$(top_builddir)/libgnomeui/libgnomeui.la 	\
+	$(top_builddir)/libgnome/libgnome.la		\
+        $(X_LIBS)
+
+panel_LDADD = $(MYLIBS) 
+
+module_test_LDADD = $(MYLIBS)
diff -uNr gnome-0.6/programs/panel/Makefile.in gnome-0.7/programs/panel/Makefile.in
--- gnome-0.6/programs/panel/Makefile.in	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/Makefile.in	Fri Oct  3 01:04:36 1997
@@ -0,0 +1,418 @@
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+host_alias = @host_alias@
+host_triplet = @host@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+DATADIRNAME = @DATADIRNAME@
+ELCFILES = @ELCFILES@
+EMACS = @EMACS@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLSUB = @INTLSUB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LIBTOOL = @LIBTOOL@
+LISPDIR = @LISPDIR@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MSGFMT = @MSGFMT@
+NM = @NM@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+
+SUBDIRS  = menu mailcheck
+
+INCLUDES = 			\
+	-I../.. 		\
+	-I$(srcdir)/../.. 	\
+	-I$(includedir)		\
+	$(X_CFLAGS)
+
+bin_PROGRAMS = panel module_test
+
+panel_SOURCES = \
+	applet.c	\
+	applet.h	\
+	main.c		\
+	panel.c		\
+	panel.h
+
+module_test_SOURCES = \
+	module_test.c 
+
+MYLIBS = \
+	$(top_builddir)/libgnomeui/libgnomeui.la 	\
+	$(top_builddir)/libgnome/libgnome.la		\
+        $(X_LIBS)
+
+panel_LDADD = $(MYLIBS) 
+
+module_test_LDADD = $(MYLIBS)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../config.h
+CONFIG_CLEAN_FILES = 
+PROGRAMS =  $(bin_PROGRAMS)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+LIBS = @LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_LIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+panel_OBJECTS =  applet.o main.o panel.o
+panel_DEPENDENCIES =  $(top_builddir)/libgnomeui/libgnomeui.la \
+$(top_builddir)/libgnome/libgnome.la
+panel_LDFLAGS = 
+module_test_OBJECTS =  module_test.o
+module_test_DEPENDENCIES =  $(top_builddir)/libgnomeui/libgnomeui.la \
+$(top_builddir)/libgnome/libgnome.la
+module_test_LDFLAGS = 
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+SOURCES = $(panel_SOURCES) $(module_test_SOURCES)
+OBJECTS = $(panel_OBJECTS) $(module_test_OBJECTS)
+
+default: all
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps programs/panel/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	$(NORMAL_UNINSTALL)
+	list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	rm -f *.o core
+
+clean-compile:
+
+distclean-compile:
+	rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	rm -f *.lo
+
+clean-libtool:
+	rm -rf .libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+panel: $(panel_OBJECTS) $(panel_DEPENDENCIES)
+	@rm -f panel
+	$(LINK) $(panel_LDFLAGS) $(panel_OBJECTS) $(panel_LDADD) $(LIBS)
+
+module_test: $(module_test_OBJECTS) $(module_test_DEPENDENCIES)
+	@rm -f module_test
+	$(LINK) $(module_test_LDFLAGS) $(module_test_OBJECTS) $(module_test_LDADD) $(LIBS)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+@SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	for subdir in $(SUBDIRS); do \
+	  target=`echo $@ | sed s/-recursive//`; \
+	  echo "Making $$target in $$subdir"; \
+	  (cd $$subdir && $(MAKE) $$target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+	for subdir in $$rev; do \
+	  target=`echo $@ | sed s/-recursive//`; \
+	  echo "Making $$target in $$subdir"; \
+	  (cd $$subdir && $(MAKE) $$target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES)
+	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	done; \
+	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = programs/panel
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+	for subdir in $(SUBDIRS); do		\
+	  test -d $(distdir)/$$subdir		\
+	  || mkdir $(distdir)/$$subdir		\
+	  || exit 1;				\
+	  chmod 777 $(distdir)/$$subdir;	\
+	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    || exit 1; \
+	done
+applet.o applet.lo: applet.c applet.h ../../gnome.h \
+	../../libgnome/libgnome.h ../../libgnome/gnome-defs.h \
+	../../libgnome/gnome-util.h ../../libgnome/gnome-hook.h \
+	../../libgnome/gnome-config.h ../../libgnome/gnome-dns.h \
+	../../libgnomeui/libgnomeui.h ../../libgnomeui/gnome-colors.h \
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h panel.h
+main.o main.lo: main.c applet.h ../../gnome.h ../../libgnome/libgnome.h \
+	../../libgnome/gnome-defs.h ../../libgnome/gnome-util.h \
+	../../libgnome/gnome-hook.h ../../libgnome/gnome-config.h \
+	../../libgnome/gnome-dns.h ../../libgnomeui/libgnomeui.h \
+	../../libgnomeui/gnome-colors.h \
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h panel.h
+module_test.o module_test.lo: module_test.c ../../gnome.h \
+	../../libgnome/libgnome.h ../../libgnome/gnome-defs.h \
+	../../libgnome/gnome-util.h ../../libgnome/gnome-hook.h \
+	../../libgnome/gnome-config.h ../../libgnome/gnome-dns.h \
+	../../libgnomeui/libgnomeui.h ../../libgnomeui/gnome-colors.h \
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h
+panel.o panel.lo: panel.c applet.h ../../gnome.h \
+	../../libgnome/libgnome.h ../../libgnome/gnome-defs.h \
+	../../libgnome/gnome-util.h ../../libgnome/gnome-hook.h \
+	../../libgnome/gnome-config.h ../../libgnome/gnome-dns.h \
+	../../libgnomeui/libgnomeui.h ../../libgnomeui/gnome-colors.h \
+	../../libgnomeui/gnome-color-selector.h \
+	../../libgnomeui/gnome-messagebox.h \
+	../../libgnomeui/gnome-pixmap.h panel.h
+
+info: info-recursive
+dvi: dvi-recursive
+check: all-am
+	$(MAKE) check-recursive
+installcheck: installcheck-recursive
+all-am: Makefile $(PROGRAMS)
+
+install-exec-am: install-binPROGRAMS
+
+uninstall-am: uninstall-binPROGRAMS
+
+install-exec: install-exec-recursive install-exec-am
+	@$(NORMAL_INSTALL)
+
+install-data: install-data-recursive
+	@$(NORMAL_INSTALL)
+
+install: install-recursive install-exec-am
+	@:
+
+uninstall: uninstall-recursive uninstall-am
+
+all: all-recursive all-am
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs: installdirs-recursive
+	$(mkinstalldirs)  $(bindir)
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-generic
+
+clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+		clean-generic mostlyclean-am
+
+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+		distclean-tags distclean-generic clean-am
+
+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+		maintainer-clean-compile maintainer-clean-libtool \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
+
+mostlyclean:  mostlyclean-recursive mostlyclean-am
+
+clean:  clean-recursive clean-am
+
+distclean:  distclean-recursive distclean-am
+	rm -f config.status
+	rm -f libtool
+
+maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
+clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
+install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
+installcheck all-am install-exec-am uninstall-am install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr gnome-0.6/programs/panel/applet.c gnome-0.7/programs/panel/applet.c
--- gnome-0.6/programs/panel/applet.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/applet.c	Thu Oct  2 23:01:34 1997
@@ -0,0 +1,167 @@
+#include <dirent.h>
+#include <dlfcn.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include "applet.h"
+
+
+typedef struct {
+	void *dl_handle;
+	char *filename;
+} AppletFile;
+
+
+static GHashTable *applet_files_ht = NULL;
+
+
+static AppletFile *
+applet_file_new(void *dl_handle, char *filename)
+{
+	AppletFile *af;
+
+	af = g_new(AppletFile, 1);
+
+	af->dl_handle = dl_handle;
+	af->filename  = filename;
+
+	return af;
+}
+
+
+static void
+applet_file_destroy(gpointer key, gpointer value, gpointer user_data)
+{
+	AppletFile *af;
+
+	af = value;
+
+	dlclose(af->dl_handle);
+	g_free(af->filename);
+	g_free(af);
+}
+
+
+static void *
+get_dl_func(void *handle, char *name)
+{
+	void *func;
+	char *error;
+
+	func = dlsym(handle, name);
+	if ((error = dlerror()) != NULL) {
+		fprintf(stderr, "get_dl_func: %s\n", error);
+		exit(1);
+	}
+
+	return func;
+}
+
+
+static void
+query_applet_file(char *filename)
+{
+	void            *handle;
+	AppletQueryFunc  query;
+	char            *error;
+	char            *id;
+	AppletFile      *af;
+
+	handle = dlopen(filename, RTLD_LAZY);
+	if (!handle) {
+		/* FIXME: this should be a nice message box */
+		error = dlerror();
+		fprintf(stderr, "applet_query: %s\n", error);
+		return;
+	}
+
+	query = get_dl_func(handle, "query");
+
+	id = (*query) ();
+	if (!id) {
+		fprintf(stderr, "applet_query: query() on %s returned a NULL identifier\n", filename);
+		return;
+	}
+
+	af = applet_file_new(handle, g_strdup(filename));
+	
+	g_hash_table_insert(applet_files_ht, id, af);
+}
+
+
+static void
+applet_files_init(void)
+{
+	char          *dirname;
+	DIR           *dir;
+	struct dirent *dir_ent;
+	char          *filename;
+	struct stat    filestat;
+	int            len;
+	
+	applet_files_ht = g_hash_table_new(g_string_hash, g_string_equal);
+
+	dirname = gnome_unconditional_libdir_file("."); /* Get libdir name */
+
+	dir = opendir(dirname);
+	if (dir == NULL)
+		return;
+
+	while ((dir_ent = readdir(dir)) != NULL) {
+		/* We only want stuff of the form "libpanel_*.so" */
+		
+		if (strncmp(dir_ent->d_name, "libpanel_", 9) != 0)
+			continue;
+
+		len = strlen(dir_ent->d_name); /* Cannot be less than 9, because of above */
+
+		if (strcmp(dir_ent->d_name + (len - 3), ".so") != 0)
+			continue;
+		
+		filename = g_concat_dir_and_file(dirname, dir_ent->d_name);
+
+		if ((stat(filename, &filestat) == 0) &&
+		    S_ISREG(filestat.st_mode))
+			query_applet_file(filename);
+
+		g_free(filename);
+	}
+
+	closedir(dir);
+
+	g_free(dirname);
+}
+
+
+void
+applets_init(void)
+{
+	applet_files_init();
+}
+
+
+void
+applets_destroy(void)
+{
+	g_hash_table_foreach(applet_files_ht, applet_file_destroy, NULL);
+	g_hash_table_destroy(applet_files_ht);
+}
+
+
+void
+applets_init_applet(char *name, Panel *panel, char *params, int xpos, int ypos)
+{
+	AppletFile     *af;
+	AppletInitFunc  init;
+
+	af = g_hash_table_lookup(applet_files_ht, name);
+
+	if (!af) {
+		/* FIXME: this should be a nice message box */
+		fprintf(stderr, "applets_init_applet: applet type \"%s\" is not available\n", name);
+		return;
+	}
+
+	init = get_dl_func(af->dl_handle, "init");
+	(*init) (panel_command, panel, params, xpos, ypos);
+}
diff -uNr gnome-0.6/programs/panel/applet.h gnome-0.7/programs/panel/applet.h
--- gnome-0.6/programs/panel/applet.h	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/applet.h	Thu Oct  2 23:01:44 1997
@@ -0,0 +1,22 @@
+#ifndef APPLET_H
+#define APPLET_H
+
+#include "gnome.h"
+#include "panel.h"
+
+BEGIN_GNOME_DECLS
+
+
+typedef char * (*AppletQueryFunc) (void);
+typedef void (*AppletInitFunc) (PanelCallback callback, Panel *panel, char *params, int xpos, int ypos);
+typedef void (*AppletPropertiesFunc) (GtkWidget *applet);
+
+
+void applets_init(void);
+void applets_destroy(void);
+void applets_init_applet(char *name, Panel *panel, char *params, int xpos, int ypos);
+
+
+END_GNOME_DECLS
+
+#endif
diff -uNr gnome-0.6/programs/panel/mailcheck/Makefile.am gnome-0.7/programs/panel/mailcheck/Makefile.am
--- gnome-0.6/programs/panel/mailcheck/Makefile.am	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/mailcheck/Makefile.am	Wed Oct  1 12:39:07 1997
@@ -0,0 +1,13 @@
+
+INCLUDES = 			\
+	-I../../.. 		\
+	-I$(srcdir)/../../.. 	\
+	-I$(includedir)		\
+	$(X_CFLAGS)
+
+lib_LTLIBRARIES = libpanel_mailcheck.la
+
+libpanel_mailcheck_la_SOURCES = 	\
+	mailcheck.c
+
+
diff -uNr gnome-0.6/programs/panel/mailcheck/Makefile.in gnome-0.7/programs/panel/mailcheck/Makefile.in
--- gnome-0.6/programs/panel/mailcheck/Makefile.in	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/mailcheck/Makefile.in	Fri Oct  3 01:04:40 1997
@@ -0,0 +1,302 @@
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+host_alias = @host_alias@
+host_triplet = @host@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+DATADIRNAME = @DATADIRNAME@
+ELCFILES = @ELCFILES@
+EMACS = @EMACS@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLSUB = @INTLSUB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LIBTOOL = @LIBTOOL@
+LISPDIR = @LISPDIR@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MSGFMT = @MSGFMT@
+NM = @NM@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+
+INCLUDES = 			\
+	-I../../.. 		\
+	-I$(srcdir)/../../.. 	\
+	-I$(includedir)		\
+	$(X_CFLAGS)
+
+lib_LTLIBRARIES = libpanel_mailcheck.la
+
+libpanel_mailcheck_la_SOURCES = 	\
+	mailcheck.c
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../../config.h
+CONFIG_CLEAN_FILES = 
+LTLIBRARIES =  $(lib_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
+LIBS = @LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_LIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+libpanel_mailcheck_la_LDFLAGS = 
+libpanel_mailcheck_la_LIBADD = 
+libpanel_mailcheck_la_OBJECTS =  mailcheck.lo
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+SOURCES = $(libpanel_mailcheck_la_SOURCES)
+OBJECTS = $(libpanel_mailcheck_la_OBJECTS)
+
+default: all
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps programs/panel/mailcheck/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-libLTLIBRARIES:
+
+clean-libLTLIBRARIES:
+	test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+
+distclean-libLTLIBRARIES:
+
+maintainer-clean-libLTLIBRARIES:
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(libdir)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	$(NORMAL_UNINSTALL)
+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	rm -f *.o core
+
+clean-compile:
+
+distclean-compile:
+	rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	rm -f *.lo
+
+clean-libtool:
+	rm -rf .libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+libpanel_mailcheck.la: $(libpanel_mailcheck_la_OBJECTS) $(libpanel_mailcheck_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libpanel_mailcheck_la_LDFLAGS) $(libpanel_mailcheck_la_OBJECTS) $(libpanel_mailcheck_la_LIBADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES)
+	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+	tags=; \
+	here=`pwd`; \
+	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = programs/panel/mailcheck
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+mailcheck.o mailcheck.lo: mailcheck.c ../../../gnome.h \
+	../../../libgnome/libgnome.h ../../../libgnome/gnome-defs.h \
+	../../../libgnome/gnome-util.h ../../../libgnome/gnome-hook.h \
+	../../../libgnome/gnome-config.h ../../../libgnome/gnome-dns.h \
+	../../../libgnomeui/libgnomeui.h \
+	../../../libgnomeui/gnome-colors.h \
+	../../../libgnomeui/gnome-color-selector.h \
+	../../../libgnomeui/gnome-messagebox.h \
+	../../../libgnomeui/gnome-pixmap.h ../applet.h ../panel.h
+
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: install-libLTLIBRARIES
+	@$(NORMAL_INSTALL)
+
+install-data: 
+	@$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: uninstall-libLTLIBRARIES
+
+all: Makefile $(LTLIBRARIES)
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+	$(mkinstalldirs)  $(libdir)
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-generic
+
+clean:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
+		clean-generic mostlyclean
+
+distclean:  distclean-libLTLIBRARIES distclean-compile distclean-libtool \
+		distclean-tags distclean-generic clean
+	rm -f config.status
+	rm -f libtool
+
+maintainer-clean:  maintainer-clean-libLTLIBRARIES \
+		maintainer-clean-compile maintainer-clean-libtool \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info dvi installcheck \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr gnome-0.6/programs/panel/mailcheck/mailcheck.c gnome-0.7/programs/panel/mailcheck/mailcheck.c
--- gnome-0.6/programs/panel/mailcheck/mailcheck.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/mailcheck/mailcheck.c	Fri Oct  3 01:04:10 1997
@@ -0,0 +1,125 @@
+/*
+ * GNOME panel mail check module.
+ * (C) 1997 The Free Software Foundation
+ *
+ * Author: Miguel de Icaza
+ *
+ * Exported interfaces to the GNOME Panel
+ */
+
+#include <stdio.h>
+#include <libintl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <string.h>
+#include "gnome.h"
+#include "../applet.h"
+
+static char *mail_file;
+
+/* If set, the user has launched the mail viewer */
+int mailcleared;
+
+/* Does the user have any mail at all? */
+int anymail;
+
+/* New mail has arrived? */
+int newmail;
+
+/* Does the user have unread mail? */
+int unreadmail;
+
+/* The widget that holds the label with the mail information */
+GtkWidget *label;
+
+/* handle for the timeout */
+int mail_timeout;
+
+GtkWidget *pixmap_container;
+
+char *
+query (void)
+{
+	return "Mail check";
+}
+
+/*
+ * Get file modification time, based upon the code
+ * of Byron C. Darrah for coolmail and reused on fvwm95
+ */
+void
+check_mail_file_status ()
+{
+	static off_t oldsize = 0;
+	struct stat s;
+	off_t newsize;
+	int status;
+
+	status = stat (mail_file, &s);
+	if (status < 0){
+		oldsize = 0;
+		anymail = newmail = unreadmail = 0;
+		return;
+	}
+	
+	newsize = s.st_size;
+	anymail = newsize > 0;
+	unreadmail = (s.st_mtime >= s.st_atime && newsize > 0);
+
+	if (newsize >= oldsize && unreadmail){
+		newmail = 1;
+		mailcleared = 0;
+	} else
+		newmail = 0;
+	oldsize = newsize;
+}
+
+int
+mail_check_timeout (void *data)
+{
+	char *text;
+
+#define UG "This is a test -> "
+	check_mail_file_status ();
+	if (anymail)
+		text = g_copy_strings (UG "You have ", newmail ? "new" : "", " mail", NULL);
+	else
+		text = g_copy_strings (UG "No mail.", NULL);
+	gtk_label_set (GTK_LABEL (label), text);
+	free (text);
+}
+
+GtkWidget *
+create_mail_widgets (GtkWidget *window)
+{
+	label = gtk_label_new ("");
+	mail_check_timeout (0);
+	gtk_widget_show (label);
+	mail_timeout = gtk_timeout_add (10000, mail_check_timeout, 0);
+	return label;
+}
+
+void
+init (PanelCallback callback, Panel *panel, char *params, int xpos, int ypos)
+{
+	PanelCommand cmd;
+	GtkWidget *mailcheck;
+
+	/* Only allow one instance of this module */
+	if (mail_file)
+		return;
+	
+	mail_file = getenv ("MAIL");
+	if (!mail_file)
+		return;
+
+	mailcheck = create_mail_widgets (panel->window);
+	cmd.cmd = PANEL_CMD_REGISTER_TOY;
+	cmd.params.register_toy.applet = mailcheck;
+	cmd.params.register_toy.xpos   = xpos;
+	cmd.params.register_toy.ypos   = ypos;
+	cmd.params.register_toy.flags  = 0;
+
+	(*callback) (panel, &cmd);
+}
diff -uNr gnome-0.6/programs/panel/main.c gnome-0.7/programs/panel/main.c
--- gnome-0.6/programs/panel/main.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/main.c	Thu Oct  2 22:26:23 1997
@@ -0,0 +1,67 @@
+#include <string.h>
+#include "applet.h"
+#include "panel.h"
+
+static Panel *panel;
+
+static void
+load_default_applets(void)
+{
+	applets_init_applet("Menu", panel, ".", 0, 0);
+	applets_init_applet("Mail check", panel, "", 550, 0);
+}
+
+
+static void
+init_user_applets(void)
+{
+	void *iterator;
+	char *key;
+	char *value;
+	char *applet_name;
+	char *applet_params;
+	int   xpos, ypos;
+
+	iterator = gnome_config_init_iterator("/panel/Applets");
+
+	if (!iterator)
+		load_default_applets();
+	
+	while (iterator) {
+		iterator = gnome_config_iterator_next(iterator, &key, &value);
+
+		applet_params = strchr(key, ','); /* Everything after first comma is parameters to the applet */
+		if (applet_params) 
+			*applet_params++ = '\0'; /* Terminate string at comma and skip over it */
+		else
+			applet_params = "";
+
+		applet_name = key;
+
+		if (sscanf(value, "%d%d", &xpos, &ypos) != 2) {
+			fprintf(stderr, "init_user_applets: using position (0, 0) for applet "
+				"without specified position\n");
+
+			xpos = ypos = 0;
+		}
+		applets_init_applet(applet_name, panel, applet_params, xpos, ypos);
+	}
+}
+
+
+int
+main(int argc, char **argv)
+{
+	gtk_init(&argc, &argv);
+	gnome_init(&argc, &argv);
+
+	panel = panel_new();
+
+	applets_init();
+	init_user_applets();
+
+	gtk_widget_show(panel->window);
+	
+	gtk_main();
+	return 0;
+}
diff -uNr gnome-0.6/programs/panel/menu/Makefile.am gnome-0.7/programs/panel/menu/Makefile.am
--- gnome-0.6/programs/panel/menu/Makefile.am	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/menu/Makefile.am	Wed Oct  1 21:16:37 1997
@@ -0,0 +1,21 @@
+
+INCLUDES = 			\
+	-I../../.. 		\
+	-I$(srcdir)/../../.. 	\
+	-I$(includedir)		\
+	$(X_CFLAGS)
+
+#bin_PROGRAMS = menx
+#
+#menu_SOURCES = \
+#	main.xc		
+#
+#menu_LDADD = \
+#	$(top_builddir)/libgnome/libgnome.la		\
+#	$(top_builddir)/libgnomeui/libgnomeui.la 	\
+#        $(X_LIBS)
+
+lib_LTLIBRARIES = libpanel_menu.la
+
+libpanel_menu_la_SOURCES = 	\
+	main.c
diff -uNr gnome-0.6/programs/panel/menu/Makefile.in gnome-0.7/programs/panel/menu/Makefile.in
--- gnome-0.6/programs/panel/menu/Makefile.in	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/menu/Makefile.in	Fri Oct  3 01:04:37 1997
@@ -0,0 +1,311 @@
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+host_alias = @host_alias@
+host_triplet = @host@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+DATADIRNAME = @DATADIRNAME@
+ELCFILES = @ELCFILES@
+EMACS = @EMACS@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLSUB = @INTLSUB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LIBTOOL = @LIBTOOL@
+LISPDIR = @LISPDIR@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MSGFMT = @MSGFMT@
+NM = @NM@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+
+INCLUDES = 			\
+	-I../../.. 		\
+	-I$(srcdir)/../../.. 	\
+	-I$(includedir)		\
+	$(X_CFLAGS)
+
+#bin_PROGRAMS = menx
+#
+#menu_SOURCES = \
+#	main.xc		
+#
+#menu_LDADD = \
+#	$(top_builddir)/libgnome/libgnome.la		\
+#	$(top_builddir)/libgnomeui/libgnomeui.la 	\
+#        $(X_LIBS)
+
+lib_LTLIBRARIES = libpanel_menu.la
+
+libpanel_menu_la_SOURCES = 	\
+	main.c
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../../config.h
+CONFIG_CLEAN_FILES = 
+LTLIBRARIES =  $(lib_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
+LIBS = @LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_LIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+libpanel_menu_la_LDFLAGS = 
+libpanel_menu_la_LIBADD = 
+libpanel_menu_la_OBJECTS =  main.lo
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+SOURCES = $(libpanel_menu_la_SOURCES)
+OBJECTS = $(libpanel_menu_la_OBJECTS)
+
+default: all
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps programs/panel/menu/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-libLTLIBRARIES:
+
+clean-libLTLIBRARIES:
+	test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+
+distclean-libLTLIBRARIES:
+
+maintainer-clean-libLTLIBRARIES:
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(libdir)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	$(NORMAL_UNINSTALL)
+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	rm -f *.o core
+
+clean-compile:
+
+distclean-compile:
+	rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	rm -f *.lo
+
+clean-libtool:
+	rm -rf .libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+libpanel_menu.la: $(libpanel_menu_la_OBJECTS) $(libpanel_menu_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libpanel_menu_la_LDFLAGS) $(libpanel_menu_la_OBJECTS) $(libpanel_menu_la_LIBADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES)
+	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+	tags=; \
+	here=`pwd`; \
+	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = programs/panel/menu
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+main.o main.lo: main.c ../../../gnome.h ../../../libgnome/libgnome.h \
+	../../../libgnome/gnome-defs.h ../../../libgnome/gnome-util.h \
+	../../../libgnome/gnome-hook.h ../../../libgnome/gnome-config.h \
+	../../../libgnome/gnome-dns.h ../../../libgnomeui/libgnomeui.h \
+	../../../libgnomeui/gnome-colors.h \
+	../../../libgnomeui/gnome-color-selector.h \
+	../../../libgnomeui/gnome-messagebox.h \
+	../../../libgnomeui/gnome-pixmap.h ../applet.h ../panel.h
+
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: install-libLTLIBRARIES
+	@$(NORMAL_INSTALL)
+
+install-data: 
+	@$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: uninstall-libLTLIBRARIES
+
+all: Makefile $(LTLIBRARIES)
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+	$(mkinstalldirs)  $(libdir)
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-generic
+
+clean:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
+		clean-generic mostlyclean
+
+distclean:  distclean-libLTLIBRARIES distclean-compile distclean-libtool \
+		distclean-tags distclean-generic clean
+	rm -f config.status
+	rm -f libtool
+
+maintainer-clean:  maintainer-clean-libLTLIBRARIES \
+		maintainer-clean-compile maintainer-clean-libtool \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info dvi installcheck \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr gnome-0.6/programs/panel/menu/main.c gnome-0.7/programs/panel/menu/main.c
--- gnome-0.6/programs/panel/menu/main.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/menu/main.c	Thu Oct  2 23:36:03 1997
@@ -0,0 +1,497 @@
+/*
+ * GNOME panel menu module.
+ * (C) 1997 The Free Software Foundation
+ *
+ * Author: Miguel de Icaza
+ *
+ * Exported interfaces to the GNOME Panel
+ */
+
+#include <stdio.h>
+#include <libintl.h>
+#include <sys/stat.h>
+#include <dlfcn.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <string.h>
+#include "gnome.h"
+#include "../applet.h"
+#define _(String) gettext(String)
+
+struct item_config {
+	char *exec;
+	char *icon_base;
+	char *docpath;
+	char *info;
+	int  terminal;
+	char *type;
+
+	/* These are computed from icon_base */
+	char *small_icon;
+	char *transparent_icon;
+};
+
+#define free_if_empty(x) { if (x) free (x); }
+
+PanelCallback callback;
+
+char *
+query (void)
+{
+	return "Menu";
+}
+
+void
+activate_app_def (GtkWidget *widget, void *data)
+{
+	struct item_config *item = data;
+	char *command;
+
+	/* This is the quick hack version of this */
+	command = g_copy_strings ("(true;", item->exec, ") &", NULL);
+	system (command);
+	free (command);
+}
+
+void
+setup_menuitem (GtkWidget *menuitem, GtkWidget *pixmap, char *thisfile)
+{
+	GtkWidget *label, *hbox, *align;
+	char *p = strstr (thisfile, ".desktop");
+
+	if (p)
+		*p = 0;
+
+	label = gtk_label_new (thisfile);
+	gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
+	gtk_widget_show (label);
+	
+	hbox = gtk_hbox_new (FALSE, 0);
+	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	gtk_container_border_width (GTK_CONTAINER (align), 1);
+
+	gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
+	gtk_container_add (GTK_CONTAINER (menuitem), hbox);
+
+	if (pixmap){
+		gtk_container_add (GTK_CONTAINER (align), pixmap);
+		gtk_widget_set_usize (align, 22, 16);
+	} else
+		gtk_widget_set_usize (align, 22, 16);
+	
+	gtk_widget_show (align);
+	gtk_widget_show (hbox);
+	gtk_widget_show (menuitem);
+}
+
+void
+free_app_def (GtkWidget *widget, void *data)
+{
+	struct item_config *item = data;
+
+	free_if_empty (item->exec);
+	free_if_empty (item->icon_base);
+	free_if_empty (item->docpath);
+	free_if_empty (item->info);
+	free_if_empty (item->type);
+	free_if_empty (item->small_icon);
+	free_if_empty (item->transparent_icon);
+	free (item);
+}
+
+int
+is_program_in_path (char *program)
+{
+	static char *path;
+	static char **paths;
+	char **p;
+	char *f;
+	
+	if (!path){
+		char *p;
+		int i, pc = 1;
+
+		path = strdup (getenv ("PATH"));
+		for (p = path; *p; p++)
+			if (*p == ':')
+				pc++;
+
+		paths = (char **) g_malloc (sizeof (char *) * (pc+1));
+
+		for (p = path, i = 0; i < pc; i++){
+			paths [i] = strtok (p, ":");
+			p = NULL;
+		}
+		paths [pc] = NULL;
+	}
+	p = paths;
+	while (*p){
+		f = g_concat_dir_and_file (*p, program);
+		if (g_file_exists (f)){
+			free (f);
+			return 1;
+		}
+		free (f);
+		p++;
+	}
+	return 0;
+}
+	      
+struct item_config *
+load_app_def (char *file)
+{
+	struct item_config *newitem;
+	char *prefix = g_copy_strings ("=", file, "=/Desktop Entry/", NULL);
+	char *exec_file, *try_file, *dot;
+
+	gnome_config_set_prefix (prefix);
+	free (prefix);
+
+	exec_file = gnome_config_get_string ("Exec");
+	if (!exec_file){
+		gnome_config_drop_prefix ();
+		return 0;
+	}
+	try_file = gnome_config_get_string ("TryExec");
+	if (try_file){
+		if (!is_program_in_path (try_file)){
+			free (try_file);
+			free (exec_file);
+			gnome_config_drop_prefix ();
+			return 0;
+		}
+	}
+	free (try_file);
+	newitem = g_malloc (sizeof (struct item_config));
+	newitem->exec      = exec_file;
+	newitem->icon_base = gnome_config_get_string ("Icon");
+	newitem->docpath   = gnome_config_get_string ("DocPath");
+	newitem->info      = gnome_config_get_string ("Info");
+	newitem->terminal  = gnome_config_get_int    ("Terminal");
+	newitem->type      = gnome_config_get_string ("Type");
+
+	if (newitem->icon_base && *newitem->icon_base){
+		dot = strstr (newitem->icon_base, ".xpm");
+
+		if (dot){
+			*dot = 0;
+
+			newitem->small_icon = g_copy_strings (newitem->icon_base,
+					      "-small.xpm", NULL);
+			newitem->transparent_icon = g_copy_strings (newitem->icon_base,
+					      "-transparent.xpm", NULL);
+			*dot = '.';
+		}
+
+		/* Sigh, now we need to make them local to the gnome install */
+		if (*newitem->icon_base != '/'){
+			char *s = newitem->small_icon;
+			char *t = newitem->transparent_icon;
+
+			newitem->small_icon = gnome_pixmap_file (s);
+			newitem->transparent_icon = gnome_pixmap_file (t);
+			free (s);
+			free (t);
+		}
+	} else {
+		newitem->small_icon = newitem->transparent_icon = 0;
+	}
+	gnome_config_drop_prefix ();
+	return newitem;
+}
+
+GtkWidget *
+create_menu_at (GtkWidget *window, char *menudir)
+{	
+	struct item_config *item_info;
+	GtkWidget *menu;
+	struct dirent *dent;
+	struct stat s;
+	char *filename;
+	DIR *dir;
+	int  items = 0;
+	
+	dir = opendir (menudir);
+	if (dir == NULL)
+		return NULL;
+
+	menu = gtk_menu_new ();
+	
+	while ((dent = readdir (dir)) != NULL){
+		GtkWidget *menuitem, *sub, *pixmap;
+		char *thisfile = dent->d_name, *pixmap_name;
+
+		/* Skip over . and .. */
+		if ((thisfile [0] == '.' && thisfile [1] == 0) ||
+		    (thisfile [0] == '.' && thisfile [1] == '.' && thisfile [2] == 0))
+			continue;
+
+		filename = g_concat_dir_and_file (menudir, thisfile);
+		if (stat (filename, &s) == -1){
+			free (filename);
+			continue;
+		}
+
+		sub = 0;
+		item_info = 0;
+		if (S_ISDIR (s.st_mode)){
+			sub = create_menu_at (window, filename);
+			if (!sub){
+				free (filename);
+				continue;
+			}
+			/* just for now */
+			pixmap_name = 0;
+		} else {
+			if (strstr (filename, ".desktop") == 0){
+				free (filename);
+				continue;
+			}
+			item_info = load_app_def (filename);
+			if (!item_info){
+				free (filename);
+				continue;
+			}
+			pixmap_name = item_info->small_icon;
+
+		}
+		items++;
+		menuitem = gtk_menu_item_new ();
+		if (sub)
+			gtk_menu_item_set_submenu (GTK_MENU_ITEM(menuitem), sub);
+
+		pixmap = 0;
+		if (pixmap_name && g_file_exists (pixmap_name)){
+			pixmap = gnome_create_pixmap_widget (window, menuitem, item_info->small_icon);
+			if (pixmap)
+				gtk_widget_show (pixmap);
+		}
+		setup_menuitem (menuitem, pixmap, thisfile);
+
+		gtk_menu_append (GTK_MENU (menu), menuitem);
+		gtk_signal_connect (GTK_OBJECT (menuitem), "destroy", (GtkSignalFunc) free_app_def, item_info);
+		gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) activate_app_def, item_info);
+		
+		free (filename);
+	}
+	closedir (dir);
+
+	if (items == 0){
+		gtk_widget_destroy (menu);
+		return 0;
+	}
+	return menu;
+}
+
+void
+menu_position (GtkMenu *menu, gint *x, gint *y, gpointer data)
+{
+	GtkWidget *widget = (GtkWidget *) data;
+	int wx, wy;
+	
+	gdk_window_get_origin (widget->window, &wx, &wy);
+	
+	*x = wx;
+	*y = wy - GTK_WIDGET (menu)->allocation.height;
+}
+
+void
+activate_menu (GtkWidget *widget, void *closure)
+{
+        GtkWidget *menu = closure ;
+
+	gtk_menu_popup (GTK_MENU (menu), 0, 0, menu_position, widget, 1, 0);
+}
+
+void
+panel_configure (GtkWidget *widget, void *data)
+{
+	printf ("Panel configuration\n");
+}
+
+void
+panel_reload (GtkWidget *widget, void *data)
+{
+}
+
+GtkWidget *
+create_panel_submenu (void)
+{
+	GtkWidget *menu, *menuitem;
+
+	menu = gtk_menu_new ();
+	
+	menuitem = gtk_menu_item_new ();
+	setup_menuitem (menuitem, 0, _("Configure"));
+	gtk_menu_append (GTK_MENU (menu), menuitem);
+        gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) panel_configure, 0);
+
+	menuitem = gtk_menu_item_new ();
+	setup_menuitem (menuitem, 0, _("Reload configuration"));
+	gtk_menu_append (GTK_MENU (menu), menuitem);
+        gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) panel_reload, 0);
+
+	return menu;
+}
+
+void
+panel_lock (GtkWidget *widget, void *data)
+{
+	system ("gnome-lock");
+}
+
+void
+panel_logout (GtkWidget *widget, void *data)
+{
+	PanelCommand cmd;
+
+	cmd.cmd = PANEL_CMD_QUIT;
+}
+
+void
+add_menu_separator (GtkWidget *menu)
+{
+	GtkWidget *menuitem;
+	
+	menuitem = gtk_menu_item_new ();
+	gtk_widget_show (menuitem);
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+}
+
+void
+add_special_entries (GtkWidget *menu)
+{
+	GtkWidget *menuitem;
+	
+	/* Panel entry */
+	menuitem = gtk_menu_item_new ();
+
+	add_menu_separator (menu);
+
+	setup_menuitem (menuitem, 0, _("Panel"));
+	gtk_menu_append (GTK_MENU (menu), menuitem);
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_panel_submenu ());
+
+	add_menu_separator (menu);
+	
+	menuitem = gtk_menu_item_new ();
+	setup_menuitem (menuitem, 0, _("Lock screen"));
+	gtk_menu_append (GTK_MENU (menu), menuitem);
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) panel_lock, 0);
+
+	menuitem = gtk_menu_item_new ();
+	setup_menuitem (menuitem, 0, _("Log out"));
+	gtk_menu_append (GTK_MENU (menu), menuitem);
+	gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) panel_logout, 0);
+}
+
+GtkWidget *
+create_panel_menu (GtkWidget *window, char *menudir, int main_menu)
+{
+	GtkWidget *vbox, *button, *pixmap, *button_pixmap, *menu;
+	static char *button_pixmap_name;
+	char *pixmap_name;
+
+	if (main_menu)
+		pixmap_name = gnome_unconditional_pixmap_file ("panel-menu-main.xpm");
+	else
+		pixmap_name = gnome_unconditional_pixmap_file ("panel-folder.xpm");
+		
+	if (!button_pixmap_name)
+		button_pixmap_name = gnome_pixmap_file ("arrowup.xpm");
+
+	vbox   = gtk_vbox_new (FALSE, 0);
+	button = gtk_button_new ();
+	gtk_widget_show (vbox);
+	gtk_widget_show (button);
+
+	button_pixmap = gnome_create_pixmap_widget (window, button, button_pixmap_name);
+	pixmap        = gnome_create_pixmap_widget (window, button, pixmap_name);
+
+	gtk_container_add (GTK_CONTAINER (button), button_pixmap);
+	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), pixmap, FALSE, FALSE, 0);
+
+	gtk_widget_show (button_pixmap);
+	gtk_widget_show (button);
+	gtk_widget_show (pixmap);
+	gtk_widget_show (vbox);
+
+	menu = create_menu_at (window, menudir);
+	if (main_menu)
+		add_special_entries (menu);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) activate_menu, menu);
+
+	free (pixmap_name);
+	return vbox;
+}
+
+GtkWidget *
+create_menu_widget (GtkWidget *window, char *arguments, char *menudir)
+{
+	GtkWidget *menu;
+	int main_menu;
+	
+	main_menu = (strcmp (arguments, ".") == 0);
+	menu = create_panel_menu (window, menudir, main_menu);
+	return menu;
+}
+
+void
+init (PanelCallback cback, Panel *panel, char *params, int xpos, int ypos)
+{
+	GtkWidget *menu_component;
+	char *menu_base = gnome_unconditional_datadir_file ("apps");
+	char *this_menu = g_concat_dir_and_file (menu_base, params);
+	PanelCommand cmd;
+
+	if (!getenv ("PATH"))
+		return;
+
+	if (!g_file_exists (this_menu)){
+		free (menu_base);
+		free (this_menu);
+		return;
+	}
+
+	callback = cback;
+	menu_component = create_menu_widget (panel->window, params, this_menu);
+
+	cmd.cmd = PANEL_CMD_REGISTER_TOY;
+	cmd.params.register_toy.applet = menu_component;
+	cmd.params.register_toy.xpos   = xpos;
+	cmd.params.register_toy.ypos   = ypos;
+	cmd.params.register_toy.flags  = 0;
+
+	(*callback) (panel, &cmd);
+}
+
+#if 0
+main (int argc, char *argv [])
+{
+	GtkWidget *window;
+	GtkWidget *thing;
+	void *lib_handle;
+	char *f;
+	void *(*init_ptr)(GtkWidget *, char *);
+
+	gtk_init (&argc, &argv);
+	gnome_init (&argc, &argv);
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+	thing = init (window, ".");
+	if (!thing)
+		return printf ("Module was not initialized\n");
+	
+	gtk_container_add (GTK_CONTAINER (window), (GtkWidget *) thing);
+	gtk_widget_set_usize (window, 48, 48);
+	gtk_window_set_policy (window, 0, 0, 1);
+	gtk_widget_show (window);
+	gtk_widget_realize (window);
+	gtk_main ();
+	
+	return 0;
+}
+#endif
diff -uNr gnome-0.6/programs/panel/module_test.c gnome-0.7/programs/panel/module_test.c
--- gnome-0.6/programs/panel/module_test.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/module_test.c	Wed Oct  1 13:30:44 1997
@@ -0,0 +1,50 @@
+/*
+ * This is a sample shell to test panel modules.
+ * Invoke with: module_test module_name
+ *
+ * Author: Miguel de Icaza
+ */
+#include <dlfcn.h>
+#include <stdio.h>
+#include "gnome.h"
+
+extern GtkWidget *init (GtkWidget *window, char *arguments);
+	
+int
+main (int argc, char *argv [])
+{
+	GtkWidget *window;
+	GtkWidget *thing;
+	void *lib_handle;
+	char *f;
+	void *(*init_ptr)(GtkWidget *, char *);
+
+	gtk_init (&argc, &argv);
+	gnome_init (&argc, &argv);
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+	if (argc != 2)
+		return printf ("use: module_test module-name\n");
+
+	lib_handle = dlopen (argv [1], RTLD_LAZY);
+	if (!lib_handle)
+		return printf ("Could not dlopen\n");
+	init_ptr = dlsym (lib_handle, "init");
+	if (!init_ptr)
+		return printf ("Could not find init in the module\n");
+	
+	thing = (*init_ptr) (window, ".");
+
+	if (!thing)
+		return printf ("Module was not initialized\n");
+	
+	gtk_container_add (GTK_CONTAINER (window), (GtkWidget *) thing);
+	gtk_widget_set_usize (window, 48, 48);
+	gtk_window_set_policy (window, 0, 0, 1);
+	gtk_widget_show (window);
+	gtk_widget_realize (window);
+	gtk_main ();
+	
+	return 0;
+}
diff -uNr gnome-0.6/programs/panel/panel.c gnome-0.7/programs/panel/panel.c
--- gnome-0.6/programs/panel/panel.c	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/panel.c	Fri Oct  3 00:17:08 1997
@@ -0,0 +1,336 @@
+#include "applet.h"
+
+
+#define DEFAULT_STEP_SIZE 4
+#define DEFAULT_DELAY     0
+#define DEFAULT_HEIGHT    48
+
+
+typedef struct {
+	int x, y;
+} Point;
+
+
+static void
+move_window(GtkWindow *window, int x, int y)
+{
+	GtkWidget *widget;
+
+	widget = GTK_WIDGET(window);
+	
+	gdk_window_set_hints(widget->window, x, y, 0, 0, 0, 0, GDK_HINT_POS);
+	gdk_window_move(widget->window, x, y);
+}
+
+
+static void
+move_horiz(Panel *panel, int src_x, int dest_x)
+{
+	int x;
+
+	if (panel->step_size != 0)
+		if (src_x < dest_x)
+			for (x = src_x; x < dest_x; x += panel->step_size) {
+				move_window(GTK_WINDOW(panel->window), x, 0); 
+				/* FIXME: do delay */
+			}
+		else
+			for (x = src_x; x > dest_x; x -= panel->step_size) {
+				move_window(GTK_WINDOW(panel->window), x, 0); 
+				/* FIXME: do delay */
+			}
+	
+	move_window(GTK_WINDOW(panel->window), dest_x, 0);
+}
+
+static void
+move_vert(Panel *panel, int src_y, int dest_y)
+{
+	int y;
+
+	if (panel->step_size != 0)
+		if (src_y < dest_y)
+			for (y = src_y; y < dest_y; y += panel->step_size) {
+				move_window(GTK_WINDOW(panel->window), 0, y);
+				/* FIXME: do delay */
+			}
+		else
+			for (y = src_y; y > dest_y; y -= panel->step_size) {
+				move_window(GTK_WINDOW(panel->window), 0, y);
+				/* FIXME: do delay */
+			}
+
+	move_window(GTK_WINDOW(panel->window), 0, dest_y);
+}
+
+
+static void
+pop_up(Panel *panel)
+{
+	int width, height;
+	int swidth, sheight;
+	
+	if (panel->state == PANEL_SHOWN)
+		return;
+
+	width   = panel->window->allocation.width;
+	height  = panel->window->allocation.height;
+	swidth  = gdk_screen_width();
+	sheight = gdk_screen_height();
+
+	switch (panel->pos) {
+		case PANEL_POS_TOP:
+			move_vert(panel, -height + 1, 0);
+			break;
+
+		case PANEL_POS_BOTTOM:
+			move_vert(panel, sheight - 1, sheight - height);
+			break;
+
+		case PANEL_POS_LEFT:
+			move_horiz(panel, -width + 1, 0);
+			break;
+
+		case PANEL_POS_RIGHT:
+			move_horiz(panel, swidth - 1, swidth - width);
+			break;
+	}
+
+	panel->state = PANEL_SHOWN;
+}
+
+static void
+pop_down(Panel *panel)
+{
+	int width, height;
+	int swidth, sheight;
+
+	if (panel->state == PANEL_HIDDEN)
+		return;
+
+	width   = panel->window->allocation.width;
+	height  = panel->window->allocation.height;
+	swidth  = gdk_screen_width();
+	sheight = gdk_screen_height();
+
+	switch (panel->pos) {
+		case PANEL_POS_TOP:
+			move_vert(panel, 0, -height + 1);
+			break;
+
+		case PANEL_POS_BOTTOM:
+			move_vert(panel, sheight - height, sheight - 1);
+			break;
+
+		case PANEL_POS_LEFT:
+			move_horiz(panel, 0, -width + 1);
+			break;
+
+		case PANEL_POS_RIGHT:
+			move_horiz(panel, swidth - width, swidth - 1);
+			break;
+	}
+
+	panel->state = PANEL_HIDDEN;
+}
+
+
+static gint
+panel_enter_notify(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+{
+	Panel *panel;
+
+	panel = data;
+
+	if ((panel->mode == PANEL_STAYS_PUT) ||
+	    (event->detail == GDK_NOTIFY_INFERIOR))
+		return FALSE;
+
+	pop_up(panel);
+
+	return FALSE;
+}
+
+
+static gint
+panel_leave_notify(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+{
+	Panel *panel;
+
+	panel = data;
+
+	if ((panel->mode == PANEL_STAYS_PUT) ||
+	    (event->detail == GDK_NOTIFY_INFERIOR))
+		return FALSE;
+
+	pop_down(panel);
+
+	return FALSE;
+}
+
+static void
+max_pos(GtkWidget *widget, gpointer data)
+{
+	Point *point;
+
+	point = data;
+
+	point->x = MAX(point->x, widget->allocation.x + widget->allocation.width);
+	point->y = MAX(point->y, widget->allocation.y + widget->allocation.height);
+}
+
+
+static void
+get_applet_placement(Panel *panel, int *x, int *y)
+{
+	Point point;
+
+	point.x = 0;
+	point.y = 0;
+	
+	gtk_container_foreach(GTK_CONTAINER(panel->fixed),
+			      (GtkCallback) max_pos,
+			      &point);
+
+	switch (panel->pos) {
+		case PANEL_POS_TOP:
+		case PANEL_POS_BOTTOM:
+			*x = point.x;
+			*y = 0;
+			break;
+
+		case PANEL_POS_LEFT:
+		case PANEL_POS_RIGHT:
+			*x = 0;
+			*y = point.y;
+			break;
+	}
+}
+
+
+static void
+change_window_cursor(GdkWindow *window, GdkCursorType cursor_type)
+{
+	GdkCursor *cursor;
+
+	cursor = gdk_cursor_new(cursor_type);
+	gdk_window_set_cursor(window, cursor);
+	gdk_cursor_destroy(cursor);
+}
+
+
+static void
+realize_change_cursor(GtkWidget *widget, gpointer data)
+{
+	change_window_cursor(widget->window, GDK_ARROW); /* XXX: I don't like this arrow */
+}
+
+
+static void
+save_applet_configuration(GtkWidget *widget, gpointer data)
+{
+}
+
+
+static void
+panel_quit(Panel *panel)
+{
+	g_assert(panel != NULL);
+
+	gtk_container_foreach(GTK_CONTAINER(panel->fixed), save_applet_configuration, panel);
+	gtk_widget_destroy(panel->window);
+	applets_destroy();
+}
+
+
+Panel *
+panel_new(void)
+{
+	Panel     *panel;
+
+	panel = g_new(Panel, 1);
+
+	panel->window = gtk_window_new(GTK_WINDOW_POPUP);
+
+	panel->fixed = gtk_fixed_new();
+	gtk_container_add(GTK_CONTAINER(panel->window), panel->fixed);
+	gtk_widget_show(panel->fixed);
+
+	panel->pos   = PANEL_POS_BOTTOM;
+	panel->state = PANEL_SHOWN;
+	panel->mode  = PANEL_GETS_HIDDEN;
+	gtk_widget_set_usize(panel->window, gdk_screen_width(), DEFAULT_HEIGHT);
+	gtk_widget_set_uposition(panel->window, 0, gdk_screen_height() - DEFAULT_HEIGHT);
+
+#if 0
+	panel->pos   = PANEL_POS_TOP;
+	panel->state = PANEL_SHOWN;
+	panel->mode  = PANEL_GETS_HIDDEN;
+	gtk_widget_set_usize(panel->window, gdk_screen_width(), DEFAULT_HEIGHT);
+	gtk_widget_set_uposition(panel->window, 0, 0);
+#endif
+#if 0
+	panel->pos   = PANEL_POS_RIGHT;
+	panel->state = PANEL_SHOWN;
+	panel->mode  = PANEL_GETS_HIDDEN;
+	gtk_widget_set_usize(panel->window, DEFAULT_HEIGHT, gdk_screen_height());
+	gtk_widget_set_uposition(panel->window, gdk_screen_width() - DEFAULT_HEIGHT, 0);
+#endif
+#if 0
+	panel->pos   = PANEL_POS_LEFT;
+	panel->state = PANEL_SHOWN;
+	panel->mode  = PANEL_GETS_HIDDEN;
+	gtk_widget_set_usize(panel->window, DEFAULT_HEIGHT, gdk_screen_height());
+	gtk_widget_set_uposition(panel->window, 0, 0);
+#endif
+	panel->step_size       = DEFAULT_STEP_SIZE;
+	panel->delay           = DEFAULT_DELAY;
+
+	gtk_signal_connect(GTK_OBJECT(panel->window), "enter_notify_event",
+			   (GtkSignalFunc) panel_enter_notify,
+			   panel);
+	gtk_signal_connect(GTK_OBJECT(panel->window), "leave_notify_event",
+			   (GtkSignalFunc) panel_leave_notify,
+			   panel);
+	gtk_signal_connect_after(GTK_OBJECT(panel->window), "realize",
+				 (GtkSignalFunc) realize_change_cursor,
+				 NULL);
+
+	return panel;
+}
+
+
+void
+panel_register_toy(Panel *panel, GtkWidget *applet, int xpos, int ypos, int flags)
+{
+	g_assert(panel != NULL);
+	g_assert(applet != NULL);
+
+	gtk_fixed_put(GTK_FIXED(panel->fixed), applet, xpos, ypos);
+	gtk_widget_show(applet);
+}
+
+
+int
+panel_command(Panel *panel, PanelCommand *cmd)
+{
+	g_assert(panel != NULL);
+	g_assert(cmd != NULL);
+	
+	switch (cmd->cmd) {
+		case PANEL_CMD_REGISTER_TOY:
+			panel_register_toy(panel,
+					   cmd->params.register_toy.applet,
+					   cmd->params.register_toy.xpos,
+					   cmd->params.register_toy.ypos,
+					   cmd->params.register_toy.flags);
+			return 0;
+
+		case PANEL_CMD_QUIT:
+			panel_quit(panel);
+			gtk_main_quit();
+			return 0;
+	}
+
+	return -1;
+}
diff -uNr gnome-0.6/programs/panel/panel.h gnome-0.7/programs/panel/panel.h
--- gnome-0.6/programs/panel/panel.h	Wed Dec 31 18:00:00 1969
+++ gnome-0.7/programs/panel/panel.h	Thu Oct  2 22:55:28 1997
@@ -0,0 +1,67 @@
+#ifndef PANEL_H
+#define PANEL_H
+
+#include "gnome.h"
+
+BEGIN_GNOME_DECLS
+
+
+typedef enum {
+	PANEL_POS_TOP,
+	PANEL_POS_BOTTOM,
+	PANEL_POS_LEFT,
+	PANEL_POS_RIGHT
+} PanelPos;
+
+typedef enum {
+	PANEL_HIDDEN,
+	PANEL_SHOWN
+} PanelState;
+
+typedef enum {
+	PANEL_STAYS_PUT,
+	PANEL_GETS_HIDDEN
+} PanelMode;
+
+typedef enum {
+	APPLET_HAS_PROPERTIES = 1 << 0
+} AppletFlags;
+
+typedef struct {
+	GtkWidget  *window;
+	GtkWidget  *fixed;
+	PanelPos    pos;
+	PanelState  state;
+	PanelMode   mode;
+	int         step_size;
+	int         delay;
+} Panel;
+
+typedef enum {
+	PANEL_CMD_REGISTER_TOY,
+	PANEL_CMD_QUIT
+} PanelCommandType;
+
+typedef struct {
+	PanelCommandType cmd;
+
+	union {
+		/* Register toy parameters */
+		struct {
+			GtkWidget *applet;
+			int        xpos;
+			int        ypos;
+			int        flags;
+		} register_toy;
+	} params;
+} PanelCommand;
+
+typedef int (*PanelCallback) (Panel *panel, PanelCommand *cmd);
+
+Panel *panel_new(void);
+
+int panel_command (Panel *panel, PanelCommand *cmd);
+
+END_GNOME_DECLS
+
+#endif