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

[brad at geodynamics.org]

Author: brad
Date: 2013-04-19 13:14:17 -0700 (Fri, 19 Apr 2013)
New Revision: 21909

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Remove curl build. Assume user will install curl/openssl, so just check that curl is available.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-04-19 18:37:00 UTC (rev 21908)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-04-19 20:14:17 UTC (rev 21909)
@@ -35,7 +35,6 @@
 PCRE_VER=8.12
 SWIG_VER=2.0.2
 
-CURL_VER=7.30.0
 GIT_VER=1.8.2.1
 
 NUMPY_VER=1.6.1-patched
@@ -647,38 +646,14 @@
 
 
 # ----------------------------------------------------------------------
-# 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 installed_curl
+git: installed_python
 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) && \
-		make prefix=$(prefix) CPPFLAGS="$(CPPFLAGS) -DNO_EXPAT -DNO_TCLTK -DNO_GETTEXT -I$(prefix)/include" LDFLAGS="-L$(prefix)/lib" all install && \
+		make prefix=$(prefix) NO_EXPAT=1 NO_TCLTK=1 NO_GETTEXT=1 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-19 18:37:00 UTC (rev 21908)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-04-19 20:14:17 UTC (rev 21909)
@@ -184,14 +184,6 @@
 	[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],
@@ -370,15 +362,10 @@
   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
+    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?])
+              ])
   else
     AC_PATH_PROG(GIT, git)
     if test -z "$GIT" ; then
@@ -805,7 +792,6 @@
 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"