--- configure.orig	Sun Apr 26 20:31:19 1998
+++ configure	Thu Feb 10 23:00:42 2000
@@ -729,7 +729,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
 
 
 PACKAGE=kpilot
@@ -1447,8 +1447,8 @@
 
 
 
-enable_static=no
-enable_shared=no
+#enable_static=no
+#enable_shared=no
 
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
@@ -1994,7 +1994,7 @@
     ; \
 do
   for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension*; then
       ac_x_libraries=$ac_dir
       break 2
     fi
@@ -2413,7 +2413,7 @@
 qt_libdir=NO
 for i in $qt_libdirs;
 do
-  for j in libqt.so libqt.so.1.30 libqt.so.1.31 libqt.so.1 libqt.a libqt.sl;
+  for j in libqt.so libqt.so.1.30 libqt.so.1.31 libqt.so.1.32 libqt.so.1.33 libqt.so.1 libqt.a libqt.sl;
   do
     if test -r "$i/$j"; then
       qt_libdir=$i
@@ -2602,7 +2602,8 @@
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin$ac_dummy; do
+  FOO="$QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin$ac_dummy"
+  for ac_dir in $FOO; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_MOC="$ac_dir/$ac_word"
@@ -4046,12 +4047,17 @@
 trap 'rm -fr `echo "Makefile \
 	kpilot/Makefile \
 	kpilot/doc/Makefile \
+	kpilot/doc/de/Makefile \
+	kpilot/doc/en/Makefile \
+	kpilot/libpilot/Makefile \
 	conduits/Makefile \
 	conduits/vcalconduit/Makefile \
+	conduits/vcalconduit/versit/Makefile \
 	conduits/popmail/Makefile \
+	po/Makefile \
 	po/en/Makefile \
 	po/de/Makefile \
-	Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+	config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4202,12 +4208,17 @@
 CONFIG_FILES=\${CONFIG_FILES-"Makefile \
 	kpilot/Makefile \
 	kpilot/doc/Makefile \
+	kpilot/doc/de/Makefile \
+	kpilot/doc/en/Makefile \
+	kpilot/libpilot/Makefile \
 	conduits/Makefile \
 	conduits/vcalconduit/Makefile \
+	conduits/vcalconduit/versit/Makefile \
 	conduits/popmail/Makefile \
+	po/Makefile \
 	po/en/Makefile \
 	po/de/Makefile \
-	Makefile"}
+	"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then