Changeset 13156

Timestamp:

08/27/12 14:01:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: install all autotools packages in one single directory to avoid issues whith autoreconf. autotools now installs autoconf, automake and libtool

Location:

issm/trunk-jpl

Files:

• etc/environment.csh (modified) (1 diff)
• etc/environment.sh (modified) (1 diff)
• externalpackages/autoconf (deleted)
• externalpackages/automake (deleted)
• externalpackages/autotools (added)
• externalpackages/autotools/install.sh (added)
• externalpackages/libtool (deleted)
• scripts/automakererun.sh (modified) (1 diff)

issm/trunk-jpl/etc/environment.csh

@@ -54 +54 @@
 endif
 
-#AUTOCONF
-set AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
-if (-d $AUTOCONF_DIR) then
-        setenv PATH {$AUTOCONF_DIR}/bin:{$PATH}
-endif
-
-#AUTOMAKE
-set AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
-if (-d $AUTOMAKE_DIR) then
-        setenv PATH {$AUTOMAKE_DIR}/bin:{$PATH}
-endif
-
-#LIBTOOL
-set LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
-if (-d $LIBTOOL_DIR) then
-        setenv PATH {$LIBTOOL_DIR}/bin:{$PATH}
+#AUTOTOOLS
+set AUTOTOOLS_DIR="$ISSM_DIR/externalpackages/autotools/install"
+if (-d $AUTOTOOLS_DIR) then
+        setenv PATH {$AUTOTOOLS_DIR}/bin:{$PATH}
 endif
 

issm/trunk-jpl/etc/environment.sh

@@ -86 +86 @@
 pathappend "$DOXYGEN_DIR/bin"
 
-AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
-pathprepend "$AUTOCONF_DIR/bin"
-
-AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
-pathprepend "$AUTOMAKE_DIR/bin"
-
-LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
-pathprepend "$LIBTOOL_DIR/bin"
+AUTOTOOLS_DIR="$ISSM_DIR/externalpackages/autotools/install"
+pathprepend "$AUTOTOOLS_DIR/bin"
 
 SDK_DIR="C:/MicrosoftVisualStudio 9.0/Microsoft Visual C++ 2008 Express Edition with SP1 - ENU"

issm/trunk-jpl/scripts/automakererun.sh

@@ -9 +9 @@
 
 cd $ISSM_DIR
-autoreconf -iv -I externalpackages/libtool/install/share/aclocal
+autoreconf -iv