Index: /issm/trunk-jpl/externalpackages/adolc/install-dev.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/adolc/install-dev.sh	(revision 13078)
+++ /issm/trunk-jpl/externalpackages/adolc/install-dev.sh	(revision 13079)
@@ -4,26 +4,20 @@
 
 #Some cleanup
-rm -rf install ADOL-C-2.2.0 src trunk
+rm -rf install ADOL-C-2.2.0 trunk
 
 #Create install directories
-mkdir install src
+mkdir install
 
 svn co https://projects.coin-or.org/svn/ADOL-C/trunk
-mv trunk/* src
 
 #Compile ADOL-C
-cd src 
+cd trunk 
 
-#export CC=gcc
-#export CXX=g++
-#export CFLAGS="-arch x86_64"
-#export CXXFLAGS="-arch x86_64"
-
-./configure \
-	--prefix=$ISSM_DIR/externalpackages/adolc/install \
-	--enable-sparse \
-	--enable-docexa \
-	--enable-addexa \
-	--disable-shave
+autoconf
+./configure --prefix=$ISSM_DIR/externalpackages/adolc/install \
+#	--enable-sparse \
+#	--enable-docexa \
+#	--enable-addexa \
+#	--disable-shave
 
 if [ -z $1 ]; then
Index: sm/trunk-jpl/externalpackages/adolc/install-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/adolc/install-macosx64.sh	(revision 13078)
+++ 	(revision )
@@ -1,71 +1,0 @@
-#!/bin/bash
-
-#some issues on macosx64 with ISSM's autoconf. you might want to run native to mac on this.
-
-#choose dev or not? 
-devpmt=1;
-
-#Some cleanup
-rm -rf install ADOL-C-2.2.0 src trunk
-
-#Create install directories
-mkdir install src
-
-if [[ $devpmt == "0" ]]; then
-	#Download from ISSM server
-	$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ADOL-C-2.2.0.tar.gz' 'ADOL-C-2.2.0.tar.gz'
-	
-	#Untar 
-	tar -zxvf  ADOL-C-2.2.0.tar.gz
-
-	#Move ADOL-C into install directory
-	mv ADOL-C-2.2.0/* src
-	rm -rf ADOL-C-2.2.0
-
-else
-	svn co https://projects.coin-or.org/svn/ADOL-C/trunk
-	mv trunk/* src
-fi
-
-
-#Compile ADOL-C
-cd src 
-
-#export CC=gcc
-#export CXX=g++
-#export CFLAGS="-arch x86_64"
-#export CXXFLAGS="-arch x86_64"
-
-./configure \
-	--prefix=$ISSM_DIR/externalpackages/adolc/install \
-	--enable-sparse \
-	--enable-docexa \
-	--enable-addexa \
-	--disable-shave
-
-if [ -z $1 ]; then
-	make
-else
-	make -j $1
-fi
-make install
-
-
-#Ok, bug with libtool: replace all LIBTOOL= by LIBTOOL=libtool 
-#in all Makefiles
-for i in `find ./ -name Makefile `
-do
-	echo $i
-	cat $i | sed 's/LIBTOOL =/LIBTOOL = libtool/g' > $i.bak 
-	mv $i.bak $i
-done
-
-#remake: 
-if [ -z $1 ]; then
-	make
-else
-	make -j $1
-fi
-make install
-
-
Index: /issm/trunk-jpl/externalpackages/adolc/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/adolc/install.sh	(revision 13078)
+++ /issm/trunk-jpl/externalpackages/adolc/install.sh	(revision 13079)
@@ -4,11 +4,11 @@
 
 #Some cleanup
-rm -rf install ADOL-C-2.2.0 src
+rm -rf install ADOL-C-2.2.0 src trunk
+
+#Create install directories
+mkdir install src
 
 #Download from ISSM server
 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ADOL-C-2.2.0.tar.gz' 'ADOL-C-2.2.0.tar.gz'
-
-#Create install directories
-mkdir install src
 
 #Untar 
@@ -19,11 +19,12 @@
 rm -rf ADOL-C-2.2.0
 
+
 #Compile ADOL-C
 cd src 
 
-export CC=gcc
-export CXX=g++
-export CFLAGS="-arch x86_64"
-export CXXFLAGS="-arch x86_64"
+#export CC=gcc
+#export CXX=g++
+#export CFLAGS="-arch x86_64"
+#export CXXFLAGS="-arch x86_64"
 
 ./configure \
@@ -40,2 +41,22 @@
 fi
 make install
+
+
+#Ok, bug with libtool: replace all LIBTOOL= by LIBTOOL=libtool 
+#in all Makefiles
+for i in `find ./ -name Makefile `
+do
+	echo $i
+	cat $i | sed 's/LIBTOOL =/LIBTOOL = libtool/g' > $i.bak 
+	mv $i.bak $i
+done
+
+#remake: 
+if [ -z $1 ]; then
+	make
+else
+	make -j $1
+fi
+make install
+
+