From: CeDeROM <cede...@tlen.pl>
---
bootstrap | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/bootstrap b/bootstrap
index 0965245..7062fc0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,14 @@
-<<<<<<< HEAD
-#!/bin/sh
-=======
#!/bin/sh -e
-#fetch necessary submodules before runing autotools
+#Prepare necessary submodules before runing autotools
+if [ "$1" = "nosubmodule" ]; then
+ SKIP_SUBMODULE=1
+elif [ -n "$1" ]; then
+ echo "$0: Illegal argument $1"
+ echo "USAGE: $0 [nosubmodule]"
+ exit 1
+fi
+
if [ -n "$SKIP_SUBMODULE" ]; then
echo "Skipping submodule setup"
else
@@ -12,11 +17,7 @@ else
git submodule update
fi
-# Run the autotools bootstrap sequence to create the configure script
-
-# Abort execution on error
-set -e
-
+#Check what libtool version to use
if which libtoolize > /dev/null; then
libtoolize="libtoolize"
elif which glibtoolize >/dev/null; then
@@ -26,14 +27,6 @@ else
exit 1
fi
-if [ "$1" = "nosubmodule" ]; then
- SKIP_SUBMODULE=1
-elif [ -n "$1" ]; then
- echo "$0: Illegal argument $1"
- echo "USAGE: $0 [nosubmodule]"
- exit 1
-fi
-
# bootstrap the autotools
(
set -x
--
1.7.4.1
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
