more updates

[synfig.git] / synfig-core / trunk / bootstrap

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index c1d8b51..85fb254 100755 (executable)
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -57,7 +57,7 @@ output Prepairing build environment for $PACKAGE-$VERSION...
 
 # Look for the CVS directory. If we don't find it, we need to
 # ask the user if they know what they are doing.
-test -d CVS ||
+( test -d CVS || test -d .svn ) ||
 {
        output warning: This shell script is intended for those
        output warning: who either know what they are doing or
@@ -215,8 +215,20 @@ set +x
        " < libltdl/ltdl.h > $TEMPFILE && cp $TEMPFILE libltdl/ltdl.h
 )
 
+(
+output Patching libtool...
+patch config/ltmain.sh config/ltmain.patch
+) ||
+{
+       # Something went wrong...
+       set +x
+       output Failure.
+       cleanup;
+       exit 1
+}
+
 #echo '#define LTDL_SHLIB_EXT  ".so"' >> libltdl/config-h.in
-echo '
+#echo '
 #ifdef WIN32
 #define LTDL_SHLIB_EXT ".dll"
 #else