Check for Xpm headers and add /usr/local/lib to /etc/ld.so.conf if

tools/wineinstall

@@ -3,6 +3,10 @@
 
 # Mar 31 1999 - Ove Kven
 #  First version
+# Dec 9 1999 - Ove Kven
+#  require Xpm
+# Feb 25 2000 - Ove Kven
+#  auto-add /usr/local/lib to /etc/ld.so.conf
 
 # defaults
 
@@ -12,7 +16,7 @@ DOREG=yes
 
 # startup...
 
-echo "WINE Installer v0.1"
+echo "WINE Installer v0.2"
 echo
 if ! [ -f configure ]
 then {
@@ -47,6 +51,12 @@ else {
     rm -f config.cache
     exit 1
   }
+  elif ! grep -qs "xpm_h=yes" config.cache
+  then {
+    echo "Install the Xpm development headers and try again."
+    rm -f config.cache
+    exit 1
+  }
   fi
 }
 fi
@@ -87,6 +97,15 @@ else {
     exit 1
   }
   fi
+  if [ -f /etc/ld.so.conf ] && ! grep -qs "/usr/local/lib" /etc/ld.so.conf
+  then {
+    echo
+    echo "/usr/local/lib didn't exist in your /etc/ld.so.conf, adding it now..."
+    echo /usr/local/lib >>/etc/ld.so.conf
+    echo "Re-running ldconfig..."
+    ldconfig
+  }
+  fi
 }
 fi
 echo
@@ -160,8 +179,10 @@ then {
   then {
     echo
     echo "Registry install failed. Perhaps you weren't running X."
+    exit 1
   }
   fi
+  # FIXME: perhaps install registry to $sysconfdir/winesystem.reg and $sysconfdir/wineuser.reg?
 }
 fi
 echo