[cig-commits] r21885 - short/3D/PyLith/pylith_installer/trunk

[brad at geodynamics.org]

Author: brad
Date: 2013-04-17 15:01:19 -0700 (Wed, 17 Apr 2013)
New Revision: 21885

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Add curl (required by git). Complete setup for building git.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-04-17 21:59:09 UTC (rev 21884)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-04-17 22:01:19 UTC (rev 21885)
@@ -34,8 +34,10 @@
 
 PCRE_VER=8.12
 SWIG_VER=2.0.2
-GIT_VER=2.2.1
 
+CURL_VER=7.30.0
+GIT_VER=1.8.2.1
+
 NUMPY_VER=1.6.1-patched
 
 PROJ4_VER=4.8.0
@@ -645,14 +647,38 @@
 
 
 # ----------------------------------------------------------------------
+# curl
+# ----------------------------------------------------------------------
+curl: 
+if INSTALL_CURL
+	$(FETCH_SCRIPT) "$(downloader)" curl-$(CURL_VER).tar.gz http://geodynamics.org/~buildbot/deps
+	$(TAR) -zxf curl-$(CURL_VER).tar.gz
+	$(MKDIR_P) curl-build
+	cd curl-build && \
+		../curl-$(CURL_VER)/configure \
+			--prefix=$(prefix) $(env_flags) $(env_compilers); \
+		make && \
+		make install && \
+		touch ../installed_curl
+
+else
+	@echo "$@ already installed. Skipping installation."
+	touch installed_curl
+endif
+
+installed_curl:
+	$(MAKE) $(AM_MAKEFLAGS) curl
+
+
+# ----------------------------------------------------------------------
 # git
 # ----------------------------------------------------------------------
-git: installed_python
+git: installed_python installed_curl
 if INSTALL_GIT
 	$(FETCH_SCRIPT) "$(downloader)" git-$(GIT_VER).tar.gz http://geodynamics.org/~buildbot/deps
 	$(TAR) -zxf git-$(GIT_VER).tar.gz
 	cd git-$(GIT_VER) && \
-		$(PYTHON) setup.py install --prefix=$(prefix) && \
+		make prefix=$(prefix) CPPFLAGS="-DNO_EXPAT -DNO_TCLTK -DNO_GETTEXT -I$(prefix)/include" LDFLAGS="-L$(prefix)/lib" all install && \
 		touch ../installed_git
 
 else

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-04-17 21:59:09 UTC (rev 21884)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-04-17 22:01:19 UTC (rev 21885)
@@ -184,6 +184,14 @@
 	[install_swig=no])
 AM_CONDITIONAL([INSTALL_SWIG], [test "$install_swig" = yes])
 
+# CURL (required by git)
+AC_ARG_ENABLE([curl],
+    [AC_HELP_STRING([--enable-curl],
+        [install curl @<:@default=no@:>@])],
+	[if test "$enableval" = "yes" ; then install_curl=yes; else install_curl=no; fi],
+	[install_curl=no])
+AM_CONDITIONAL([INSTALL_CURL], [test "$install_curl" = yes])
+
 # GIT
 AC_ARG_ENABLE([git],
     [AC_HELP_STRING([--enable-git],
@@ -362,6 +370,14 @@
   fi
   # GIT
   if test "$install_git" = yes; then
+    if test "$install_curl" = yes; then
+      echo "do nothing" >& /dev/null
+    else
+      AC_PATH_PROG(CURL, curl)
+        AC_CHECK_HEADER([curl/curl.h], [], [
+                AC_MSG_ERROR([Header file 'curl.h' not found; maybe you don't have the curl development package, e.g. 'curl-dev', installed?])
+                ])
+    fi
     echo "do nothing" >& /dev/null
   else
     AC_PATH_PROG(GIT, git)
@@ -789,6 +805,7 @@
 echo "  numpy: $install_numpy"
 echo "  fiat: $install_fiat"
 echo "  spatialdata: $install_spatialdata"
+echo "  curl: $install_curl"
 echo "  git: $install_git"
 echo "  cmake: $install_cmake"
 echo "  petsc: $install_petsc, options: $petsc_options"