Skip to content

Commit 0d3d946

Browse files
CHG: reverting configure.ac to previous version
1 parent beb46c2 commit 0d3d946

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

configure.ac

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -29,59 +29,10 @@ AM_PROG_AR
2929
#Libtool
3030
LT_INIT([win32-dll])
3131

32-
# =====================================================================
33-
# Automatic-Differentiation switches
34-
# =====================================================================
35-
AC_ARG_ENABLE([ad],
36-
AS_HELP_STRING([--enable-ad],
37-
[Build ISSM with CoDiPack+MediPack (disables PETSc)]),
38-
[enable_ad=$enableval],
39-
[enable_ad=no])
40-
41-
AC_ARG_WITH([codipack-dir],
42-
AS_HELP_STRING([--with-codipack-dir=DIR], [Prefix of CoDiPack install]),
43-
[CODIPACK_DIR=$withval],
44-
[CODIPACK_DIR=])
45-
46-
AC_ARG_WITH([medipack-dir],
47-
AS_HELP_STRING([--with-medipack-dir=DIR], [Prefix of MediPack install]),
48-
[MEDIPACK_DIR=$withval],
49-
[MEDIPACK_DIR=])
50-
51-
# --- Validation & flag embedding -------------------------------------
52-
if test "x$enable_ad" = "xyes"; then
53-
if test -z "$CODIPACK_DIR" || test -z "$MEDIPACK_DIR"; then
54-
AC_MSG_ERROR([--enable-ad needs BOTH --with-codipack-dir and --with-medipack-dir])
55-
fi
56-
57-
# Tell source files we are in AD mode
58-
AC_DEFINE([ISSM_USE_AD], [1], [Define to 1 if building with automatic differentiation])
59-
60-
# Drop PETSc automatically (picked up by m4/issm_options.m4)
61-
ENABLE_PETSC=no
62-
AM_CONDITIONAL([USE_AD], [true])
63-
else
64-
ENABLE_PETSC=yes
65-
AM_CONDITIONAL([USE_AD], [false])
66-
fi
67-
68-
dnl ---- Embed include-paths, lib-paths & libs globally -----------------
69-
if test "x$enable_ad" = "xyes"; then
70-
AM_CPPFLAGS="$AM_CPPFLAGS -I$CODIPACK_DIR/include -I$MEDIPACK_DIR/include -DCODI_ForcedInlines"
71-
AM_LDFLAGS="$AM_LDFLAGS -L$CODIPACK_DIR/lib -L$MEDIPACK_DIR/lib"
72-
LIBS="$LIBS -lcodi -lmedi"
73-
fi
74-
75-
dnl Export the variables so Automake can substitute them
76-
AC_SUBST([AM_CPPFLAGS])
77-
AC_SUBST([AM_LDFLAGS])
78-
AC_SUBST([LIBS])
79-
8032
# ---------------------------------------------------------------------
8133
# Run ISSM’s usual option-detection macro collection
8234
# ---------------------------------------------------------------------
8335
ISSM_OPTIONS
84-
ISSM_ENABLE_AD
8536

8637
# ---------------------------------------------------------------------
8738
# Output files

0 commit comments

Comments
 (0)