--- ../unix/configure.orig	Thu Mar 14 22:49:33 2002
+++ ../unix/configure	Mon May  6 22:28:50 2002
@@ -4408,7 +4408,7 @@
 lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='main(){return(0);}'
+lt_simple_link_test_code='int main(void) { return(0); }'
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
@@ -13426,10 +13426,10 @@
 fi
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='libtool'
 
 # Prevent multiple expansion