X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fbootstrap;h=3d7759b4498bb2278451232a7560b44675547a6f;hb=c5bd5e71f365fe9d1aa42b844f403d3ffc408bec;hp=c1d8b513be81db730d74438bb9037cbc63e6a28b;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index c1d8b51..3d7759b 100755
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -9,13 +9,17 @@
 #
 
 # Grab the current directory and move to our own
-CURR_DIR=$(pwd)
-cd $(dirname $0)
+CURR_DIR="$(pwd)"
+cd "$(dirname $0)"
 
 # Environment Variables
-BOOTSTRAP_NAME=$(basename $0)
-CONFIG_DIR=$(pwd)/config
+BOOTSTRAP_NAME="$(basename $0)"
+CONFIG_DIR="$(pwd)/config"
 
+[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`"
+[ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`"
+[ -x /bin/cygpath ] && CURR_DIR="`cygpath -m -s "$CURR_DIR"`"
+[ -x /bin/cygpath ] && CURR_DIR="`cygpath -u "$CURR_DIR"`"
 # Automake,Autoconf, and Libtool versions that we require
 #AUTOCONF_VERSION=2.5
 #AUTOMAKE_VERSION=1.6
@@ -57,7 +61,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 +219,20 @@ set +x
 	" < libltdl/ltdl.h > $TEMPFILE && cp $TEMPFILE libltdl/ltdl.h
 )
 
+(
+output Patching libtool...
+patch config/ltmain.sh config/ltmain.patch
+) || true
+false && {
+	# 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
@@ -294,3 +310,5 @@ cleanup;
 
 # Move back to the current directory
 cd $CURR_DIR
+
+make -C src/synfig/proto