Changeset 13101 for issm/branches/trunk-jpl-damage/configure.ac

Timestamp:

08/20/12 17:39:30 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 13099 into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• configure.ac (modified) (4 diffs)

issm/branches/trunk-jpl-damage

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/branches/trunk-jpl-damage/configure.ac

@@ -4 +4 @@
 AC_INIT([ISSM],[4.2.1],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure
 AC_CONFIG_AUX_DIR([./aux-config])         #Put config files in aux-config
-AC_CONFIG_MACRO_DIR([m4])                 #m4 macros are located in m4
+AC_CONFIG_MACRO_DIR([externalpackages/libtool/install/share/aclocal])                 #m4 macros are located in m4
+m4_include([m4/issm_options.m4])
 AC_CANONICAL_TARGET                       #Determine the system type
+
 #Compilers
 AC_PROG_CC([cccl cl icl gcc])
@@ -11 +13 @@
 AC_PROG_CXX([cccl cl icl g++])
 AC_PROG_F77([ifort g77 gfortran])
+
 #Libraries and linking
 AC_F77_LIBRARY_LDFLAGS
@@ -22 +25 @@
 AM_PROG_CC_C_O
 AM_PROG_AR
-AC_PROG_RANLIB 
 
-# To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized
-# even if all linking is static, since, if not shared libraries are to be produce, libtool
-# will act simply as a wrapper around AR and Ranlib.
-#LT_INIT
+#Libtool
+LT_INIT
 
 #Run issm_options.m4
@@ -36 +36 @@
                         src/Makefile
                         src/c/Makefile 
-                        src/py/Makefile
-                        src/py/model/Makefile
                         src/modules/Makefile
                         src/modules/python/Makefile
                         src/modules/matlab/Makefile
-                        src/m/Makefile
-                        bin/Makefile])
+                        src/m/Makefile])
 
 #End of configure.ac

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4