From: pabs <pabs@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sun, 3 Feb 2008 01:38:12 +0000 (+0000)
Subject: Get rid of all references to the bootstrap script since it was removed
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=a93e9a8c03f239eb067331491d3a276c696b27ea;p=synfig.git

Get rid of all references to the bootstrap script since it was removed

git-svn-id: http://svn.voria.com/code@1558 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/ETL/trunk/ETL.kdevprj b/ETL/trunk/ETL.kdevprj
index 44d988e..bd5dd0d 100644
--- a/ETL/trunk/ETL.kdevprj
+++ b/ETL/trunk/ETL.kdevprj
@@ -35,7 +35,7 @@ install_location=
 type=DATA
 
 [./Makefile.am]
-files=./ChangeLog,./ETL-config.in,./INSTALL,./README,./bootstrap,./config.log,./ETL.spec,./aclocal.m4,./configure,./ETL.kdevprj,./config.status,./ETL-config,
+files=./ChangeLog,./ETL-config.in,./INSTALL,./README,./config.log,./ETL.spec,./aclocal.m4,./configure,./ETL.kdevprj,./config.status,./ETL-config,
 sub_dirs=ETL,test,ETL.pbproj,config,autom4te-2.53.cache,
 type=normal
 
@@ -51,12 +51,6 @@ install=false
 install_location=
 type=DATA
 
-[./bootstrap]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [./config.log]
 dist=true
 install=false
diff --git a/ETL/trunk/ETL.pbproj/project.pbxproj b/ETL/trunk/ETL.pbproj/project.pbxproj
index b5d7e0e..1be00a6 100755
--- a/ETL/trunk/ETL.pbproj/project.pbxproj
+++ b/ETL/trunk/ETL.pbproj/project.pbxproj
@@ -1892,14 +1892,6 @@
 				F58D9F8F037F14FE01A80006,
 			);
 		};
-		F550016802F0987601000102 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = bootstrap;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F550016A02F0987601000102 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
diff --git a/ETL/trunk/Makefile.am b/ETL/trunk/Makefile.am
index 36457ed..84d0c4e 100644
--- a/ETL/trunk/Makefile.am
+++ b/ETL/trunk/Makefile.am
@@ -14,7 +14,7 @@ aclocaldir = $(prefix)/share/aclocal
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST=COPYING bootstrap m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in
+EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in
 
 CVS=cvs
 SVN=svn
diff --git a/autobuild/trunk/Makefile b/autobuild/trunk/Makefile
index 97c7297..c0f2f6d 100644
--- a/autobuild/trunk/Makefile
+++ b/autobuild/trunk/Makefile
@@ -58,7 +58,7 @@ core-src:
 	[ -d $(OUTPUTDIR) ] || mkdir $(OUTPUTDIR)
 	rm -fr $(COREDIR)
 	svn export https://svn.voria.com/code/synfig-core/trunk $(COREDIR) || exit 2
-	cd $(COREDIR) && ./bootstrap && ./configure
+	cd $(COREDIR) && libtoolize --ltdl --copy --force && autoreconf --force --install && ./configure
 	make -C $(COREDIR) dist
 	cp -r $(COREDIR)/*.gz $(OUTPUTDIR)
 
@@ -66,7 +66,7 @@ studio-src:
 	[ -d $(OUTPUTDIR) ] || mkdir $(OUTPUTDIR)
 	rm -fr $(STUDIODIR)
 	svn export https://svn.voria.com/code/synfig-studio/trunk $(STUDIODIR) || exit 2
-	cd $(STUDIODIR) && ./bootstrap && ./configure
+	cd $(STUDIODIR) && autoreconf --force --install && ./configure
 	make -C $(STUDIODIR) dist
 	cp -r $(STUDIODIR)/*.gz $(OUTPUTDIR)
 
@@ -74,7 +74,7 @@ etl-src:
 	[ -d $(OUTPUTDIR) ] || mkdir $(OUTPUTDIR)
 	rm -fr $(ETLDIR)
 	svn export https://svn.voria.com/code/ETL/trunk $(ETLDIR) || exit 2
-	cd $(ETLDIR) && ./bootstrap && ./configure
+	cd $(ETLDIR) && autoreconf --force --install && ./configure
 	make -C $(ETLDIR) dist
 	cp -r $(ETLDIR)/*.gz $(OUTPUTDIR)
 
diff --git a/synfig-core/trunk/macosxbuild.sh b/synfig-core/trunk/macosxbuild.sh
index bc418b9..702ce31 100755
--- a/synfig-core/trunk/macosxbuild.sh
+++ b/synfig-core/trunk/macosxbuild.sh
@@ -37,7 +37,7 @@ CXXCPP="g++ -E"
 
 BUILDDIR=macosxbuild
 
-[ -e configure ] || ./bootstrap || exit 1
+[ -e configure ] || ( libtoolize --ltdl --copy --force && autoreconf --force --install ) || exit 1
 
 [ -d $BUILDDIR ] && rm -fr $BUILDDIR
 
diff --git a/synfig-core/trunk/synfig.kdevprj b/synfig-core/trunk/synfig.kdevprj
index 5734f3b..e9e575c 100644
--- a/synfig-core/trunk/synfig.kdevprj
+++ b/synfig-core/trunk/synfig.kdevprj
@@ -23,7 +23,7 @@ install_location=
 type=DATA
 
 [./Makefile.am]
-files=./aclocal.m4,./config.status,./README,./configure,./config.log,./ETL.spec,./INSTALL,./ChangeLog,./ETL.kdevprj,./bootstrap,
+files=./aclocal.m4,./config.status,./README,./configure,./config.log,./ETL.spec,./INSTALL,./ChangeLog,./ETL.kdevprj,
 sub_dirs=test,config,ETL.pbproj,include,
 type=normal
 
@@ -39,12 +39,6 @@ install=false
 install_location=
 type=DATA
 
-[./bootstrap]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [./config.log]
 dist=true
 install=false
@@ -123,7 +117,7 @@ groups=Headers,Sources,GNU,Translations,User Interface,Others
 
 [Makefile.am]
 dist=true
-files=bootstrap,ChangeLog,INSTALL,Makefile.am,README,synfig.kdevprj,synfig-config.in
+files=ChangeLog,INSTALL,Makefile.am,README,synfig.kdevprj,synfig-config.in
 install=false
 install_location=
 sub_dirs=src,config
@@ -135,12 +129,6 @@ install=false
 install_location=
 type=DATA
 
-[bootstrap]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [config/ETL.m4]
 dist=true
 install=false
diff --git a/synfig-core/trunk/win32build.sh b/synfig-core/trunk/win32build.sh
index bdc8a34..921c32c 100755
--- a/synfig-core/trunk/win32build.sh
+++ b/synfig-core/trunk/win32build.sh
@@ -4,7 +4,7 @@
 
 OPTIONS="--enable-optimization=1 --disable-debug"
 
-[ -e configure ] || ./bootstrap || exit 0
+[ -e configure ] || ( libtoolize --ltdl --copy --force && autoreconf --force --install ) || exit 0
 
 [ -d win32build ] && rm -fr win32build
 
diff --git a/synfig-studio/trunk/macosxbuild.sh b/synfig-studio/trunk/macosxbuild.sh
index d4758e8..6dcfcbe 100755
--- a/synfig-studio/trunk/macosxbuild.sh
+++ b/synfig-studio/trunk/macosxbuild.sh
@@ -27,7 +27,7 @@ CPP="gcc -E"
 CXXCPP="g++ -E"
 
 
-[ -e configure ] || ./bootstrap || exit 1
+[ -e configure ] || autoreconf --force --install || exit 1
 
 [ -d $BUILDDIR ] && rm -fr $BUILDDIR
 
diff --git a/synfig-studio/trunk/studio.kdevprj b/synfig-studio/trunk/studio.kdevprj
index 4874f09..ce287f8 100644
--- a/synfig-studio/trunk/studio.kdevprj
+++ b/synfig-studio/trunk/studio.kdevprj
@@ -11,7 +11,7 @@ install_location=
 type=DATA
 
 [./Makefile.am]
-files=./README,./studio.kdevprj,./INSTALL,./ChangeLog,./bootstrap,
+files=./README,./studio.kdevprj,./INSTALL,./ChangeLog,
 sub_dirs=src,config,
 type=normal
 
@@ -21,12 +21,6 @@ install=false
 install_location=
 type=DATA
 
-[./bootstrap]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [./studio.kdevprj]
 dist=true
 install=false
@@ -87,7 +81,7 @@ groups=Headers,Sources,GNU,Translations,User Interface,Others
 
 [Makefile.am]
 dist=true
-files=bootstrap,ChangeLog,INSTALL,Makefile.am,README
+files=ChangeLog,INSTALL,Makefile.am,README
 install=false
 install_location=
 sub_dirs=src,images
@@ -99,12 +93,6 @@ install=false
 install_location=
 type=DATA
 
-[bootstrap]
-dist=true
-install=false
-install_location=
-type=DATA
-
 [config/ETL.m4]
 dist=true
 install=false
diff --git a/synfig-studio/trunk/win32build.sh b/synfig-studio/trunk/win32build.sh
index 3e59f01..b78dbb9 100755
--- a/synfig-studio/trunk/win32build.sh
+++ b/synfig-studio/trunk/win32build.sh
@@ -8,7 +8,7 @@ OPTIONS="$OPTIONS --enable-debug"
 
 BUILDDIR=win32build
 
-[ -e configure ] || ./bootstrap || exit 1
+[ -e configure ] || autoreconf --force --install || exit 1
 
 [ -d $BUILDDIR ] && rm -fr $BUILDDIR