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

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index c1d8b51..d44a45f 100755
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Sinfg Bootstrap Script
+# Synfig Bootstrap Script
 # $Id: bootstrap,v 1.2 2005/01/10 07:40:26 darco Exp $
 # 
 # This script creates the configure script and Makefile.in files,
@@ -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
@@ -33,6 +37,7 @@ s/@PACKAGE_NAME@/$PACKAGE_NAME/g;
 s/@PACKAGE_BUGREPORT@/$PACKAGE_BUGREPORT/g;
 s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
 s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
+s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
 s/@VERSION@/$VERSION/g;
 s/@API_VERSION@/$API_VERSION/g;
 s/@VERSION_MAJ@/$VERSION_MAJ/g;
@@ -57,7 +62,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
@@ -144,12 +149,12 @@ sed "$SED_SCRIPT" < $CONFIG_DIR/$FILENAME.in > $FILENAME;
 output Renaming pkgconfig.pc to $PACKAGE_TARNAME.pc.in...
 mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
 
-output Renaming project.spec to $PACKAGE-$VERSION.spec...
-mv project.spec "$PACKAGE-$VERSION.spec"
+output Renaming project.spec to $PACKAGE.spec...
+mv project.spec "$PACKAGE.spec"
 
-output Finishing up $PACKAGE-$VERSION.spec...
-echo %changelog >> "$PACKAGE-$VERSION.spec"
-cat NEWS >> "$PACKAGE-$VERSION.spec"
+output Finishing up $PACKAGE.spec...
+echo %changelog >> "$PACKAGE.spec"
+cat NEWS >> "$PACKAGE.spec"
 
 output Creating configure.in from configure.ac...
 sed "$SED_SCRIPT" < $CONFIG_DIR/configure.ac > configure.in;
@@ -215,8 +220,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
@@ -231,7 +248,7 @@ echo '
 # sed "
 # s/g++ c++/g++3 g++ c++/;
 # s/gcc cc/gcc3 gcc cc/;
-# s:"'${prefix}/include'":"'${prefix}/include/sinfg'":;
+# s:"'${prefix}/include'":"'${prefix}/include/synfig'":;
 # s:PREFIX/include:PREFIX/include/ETL:;
 # " < configure > $TEMPFILE
 # cp $TEMPFILE configure
@@ -294,3 +311,5 @@ cleanup;
 
 # Move back to the current directory
 cd $CURR_DIR
+
+make -C src/synfig/proto