[13980] | 1 | Index: ../trunk-jpl/m4/issm_options.m4
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/m4/issm_options.m4 (revision 13654)
|
---|
| 4 | +++ ../trunk-jpl/m4/issm_options.m4 (revision 13655)
|
---|
| 5 | @@ -13,29 +13,27 @@
|
---|
| 6 | fi
|
---|
| 7 |
|
---|
| 8 | dnl }}}
|
---|
| 9 | - dnl shared build {{{
|
---|
| 10 | + dnl Shared build {{{
|
---|
| 11 | AC_ARG_ENABLE([sharedlibs], dnl feature
|
---|
| 12 | AS_HELP_STRING([--enable-sharedlibs], [produce libISSM.so.0]), dnl help string
|
---|
| 13 | [enable_sharedlibs=$enableval], dnl action if given
|
---|
| 14 | [enable_sharedlibs=no]) dnl action if not given
|
---|
| 15 | AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes])
|
---|
| 16 | dnl }}}
|
---|
| 17 | -
|
---|
| 18 | - dnl shared build {{{
|
---|
| 19 | + dnl Version{{{
|
---|
| 20 | AC_ARG_ENABLE([version], dnl feature
|
---|
| 21 | AS_HELP_STRING([--enable-version], [produce libISSM.so.0]), dnl help string
|
---|
| 22 | [enable_version=$enableval], dnl action if given
|
---|
| 23 | [enable_version=no]) dnl action if not given
|
---|
| 24 | AM_CONDITIONAL([VERSION], [test x$enable_VERSION = xyes])
|
---|
| 25 | dnl }}}
|
---|
| 26 | -
|
---|
| 27 | - dnl Modules build {{{
|
---|
| 28 | - AC_ARG_WITH([modules],
|
---|
| 29 | - AS_HELP_STRING([--with-modules = value],[modules compilation. ]),
|
---|
| 30 | - [MODULES_VALUE=$withval],[MODULES_VALUE="yes"])
|
---|
| 31 | - AC_MSG_CHECKING(for modules compilation)
|
---|
| 32 | - AM_CONDITIONAL([MODULES], [test $MODULES_VALUE = yes])
|
---|
| 33 | - AC_MSG_RESULT($MODULES_VALUE)
|
---|
| 34 | + dnl Wrappers build {{{
|
---|
| 35 | + AC_ARG_WITH([wrappers],
|
---|
| 36 | + AS_HELP_STRING([--with-wrappers = value],[wrappers compilation. ]),
|
---|
| 37 | + [WRAPPERS_VALUE=$withval],[WRAPPERS_VALUE="yes"])
|
---|
| 38 | + AC_MSG_CHECKING(for wrappers compilation)
|
---|
| 39 | + AM_CONDITIONAL([WRAPPERS], [test x$WRAPPERS_VALUE = xyes])
|
---|
| 40 | + AC_MSG_RESULT($WRAPPERS_VALUE)
|
---|
| 41 | dnl }}}
|
---|
| 42 | dnl Extensions{{{
|
---|
| 43 | ISSMEXT=".exe"
|
---|
| 44 | Index: ../trunk-jpl/configure.ac
|
---|
| 45 | ===================================================================
|
---|
| 46 | --- ../trunk-jpl/configure.ac (revision 13654)
|
---|
| 47 | +++ ../trunk-jpl/configure.ac (revision 13655)
|
---|
| 48 | @@ -35,9 +35,9 @@
|
---|
| 49 | AC_CONFIG_FILES([Makefile
|
---|
| 50 | src/Makefile
|
---|
| 51 | src/c/Makefile
|
---|
| 52 | - src/modules/Makefile
|
---|
| 53 | - src/modules/python/Makefile
|
---|
| 54 | - src/modules/matlab/Makefile
|
---|
| 55 | + src/wrappers/Makefile
|
---|
| 56 | + src/wrappers/python/Makefile
|
---|
| 57 | + src/wrappers/matlab/Makefile
|
---|
| 58 | src/m/Makefile])
|
---|
| 59 |
|
---|
| 60 | #End of configure.ac
|
---|