[mathic] 05/62: autogen.sh now downloads gtest if it is not already present in libs/. The makefile target to download gtest has been removed.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository mathic.

commit 98fef67985e887b2f6b0ecb807264f547d988202
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Sun Jul 8 16:18:33 2012 -0400

    autogen.sh now downloads gtest if it is not already present in libs/. The makefile target to download gtest has been removed.
---
 Makefile.am | 18 ------------------
 autogen.sh  | 25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 62527d0..02a1be7 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,21 +104,3 @@ unittest_LDFLAGS= $(top_builddir)/libmathic-$(MATHIC_API_VERSION).la
 test_LIBS=
 unittest_SOURCES=src/test/DivFinder.cpp src/test/gtestInclude.cpp	\
 src/test/testMain.cpp
-
-# allow to download gtest in case of needing to run unit tests
-GTEST_DIR = $(top_srcdir)/libs/
-GTEST_TMP_DIR = $(top_srcdir)/libs/
-GTEST_VERSION = 1.6.0
-GTEST_DOWNLOAD_FILE = gtest-$(GTEST_VERSION).zip
-gtest: $(GTEST_DIR)/gtest
-$(GTEST_DIR)/gtest:
-	mkdir -p $(GTEST_TMP_DIR);
-	rm -rf $(GTEST_TMP_DIR)/$(GTEST_DOWNLOAD_FILE);
-	rm -rf $(GTEST_TMP_DIR)/gtest-$(GTEST_VERSION);
-	rm -rf $(GTEST_TMP_DIR)/gtest;
-	(cd $(GTEST_TMP_DIR); \
-	  wget http://googletest.googlecode.com/files/$(GTEST_DOWNLOAD_FILE); \
-	  unzip $(GTEST_DOWNLOAD_FILE);)
-	rm -rf $(GTEST_DIR)/gtest;
-	mv $(GTEST_TMP_DIR)/gtest-$(GTEST_VERSION) $(GTEST_DIR)/gtest;
-.PHONY: gtest
diff --git a/autogen.sh b/autogen.sh
index a8f9bcb..aac2d0b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,26 @@
 #!/bin/sh
+srcdir="`dirname '$0'`"
 
-autoreconf --verbose --install --force `dirname "$0"`
+autoreconf --verbose --install --force $srcdir
+
+# Download gtest into libs/gtest if it does not already exist. If you
+# changed gtest and need to get the original version back, just delete
+# the directory libs/gtest and run this script again.
+GTEST_DIR=$srcdir/libs/
+GTEST_TMP_DIR=$srcdir/libs/
+GTEST_VERSION=1.6.0
+GTEST_DOWNLOAD_FILE=gtest-$GTEST_VERSION.zip
+if [ ! -d libs/gtest ]; then
+  mkdir -p $GTEST_TMP_DIR;
+  rm -rf $GTEST_TMP_DIR/$GTEST_DOWNLOAD_FILE;
+  rm -rf $GTEST_TMP_DIR/gtest-$GTEST_VERSION;
+  rm -rf $GTEST_TMP_DIR/gtest;
+  ( \
+    cd $GTEST_TMP_DIR; \
+    wget http://googletest.googlecode.com/files/$GTEST_DOWNLOAD_FILE; \
+    unzip $GTEST_DOWNLOAD_FILE; \
+    rm $GTEST_DOWNLOAD_FILE \
+  )
+  rm -rf $GTEST_DIR/gtest;
+  mv $GTEST_TMP_DIR/gtest-$GTEST_VERSION $GTEST_DIR/gtest;
+fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git