Changeset 13655

Timestamp:

10/13/12 14:16:56 (12 years ago)

Author:

Eric.Larour

Message:

CHG: switch from modules to wrappers. Some cosmetics also.

Location:

issm/trunk-jpl

Files:

• configure.ac (modified) (1 diff)
• m4/issm_options.m4 (modified) (3 diffs)

issm/trunk-jpl/configure.ac

@@ -36 +36 @@
                         src/Makefile
                         src/c/Makefile 
-                        src/modules/Makefile
-                        src/modules/python/Makefile
-                        src/modules/matlab/Makefile
+                        src/wrappers/Makefile
+                        src/wrappers/python/Makefile
+                        src/wrappers/matlab/Makefile
                         src/m/Makefile])
 

issm/trunk-jpl/m4/issm_options.m4

@@ -14 +14 @@
 
         dnl }}}
-    dnl shared build {{{
+    dnl Shared build {{{
     AC_ARG_ENABLE([sharedlibs],                                                dnl feature
         AS_HELP_STRING([--enable-sharedlibs], [produce libISSM.so.0]),         dnl help string
@@ -21 +21 @@
     AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes])
     dnl }}}
-
-    dnl shared build {{{
+    dnl Version{{{
     AC_ARG_ENABLE([version],                                                dnl feature
         AS_HELP_STRING([--enable-version], [produce libISSM.so.0]),         dnl help string
@@ -29 +28 @@
     AM_CONDITIONAL([VERSION], [test x$enable_VERSION = xyes])
     dnl }}}
-
-        dnl Modules build {{{
-        AC_ARG_WITH([modules],
-                AS_HELP_STRING([--with-modules = value],[modules compilation. ]),
-                [MODULES_VALUE=$withval],[MODULES_VALUE="yes"])
-        AC_MSG_CHECKING(for modules compilation)
-        AM_CONDITIONAL([MODULES], [test $MODULES_VALUE = yes])
-        AC_MSG_RESULT($MODULES_VALUE) 
+        dnl Wrappers build {{{
+        AC_ARG_WITH([wrappers],
+                AS_HELP_STRING([--with-wrappers = value],[wrappers compilation. ]),
+                [WRAPPERS_VALUE=$withval],[WRAPPERS_VALUE="yes"])
+        AC_MSG_CHECKING(for wrappers compilation)
+        AM_CONDITIONAL([WRAPPERS], [test x$WRAPPERS_VALUE = xyes])
+        AC_MSG_RESULT($WRAPPERS_VALUE) 
         dnl }}}
         dnl Extensions{{{