Changeset f6e134 in git for m4

Timestamp:

Feb 2, 2017, 3:21:44 PM (7 years ago)

Author:

Erik M. Bray <erik.bray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

61fc1e3830fd4a8b592475b8c88639f3d860b87d

Parents:

3b7b3650a65b00ad55d99a0b87bca836c6c2879f

Message:

Make modules in dyn_modules require libSingular to be built first on
Windows only, and only for modules that are not being built as built-in
modules.

Location:

m4

Files:

• options.m4 (modified) (2 diffs)
• win-flags.m4 (modified) (1 diff)

m4/options.m4

@@ -329 +329 @@
       LL="${LL} $a"
       BUILTIN_LIBS="${BUILTIN_LIBS} dyn_modules/$a/$a.la"
+      BUILTIN_MODULES="${BUILTIN_MODULES} dyn_modules/$a"
       AC_MSG_RESULT(yes)
 
@@ -367 +368 @@
  AC_DEFINE_UNQUOTED([SI_BUILTINMODULES_ADD(add)],[$L],[Add(list) for Builtin modules])
  AC_SUBST(BUILTIN_LIBS)
+ AC_SUBST(BUILTIN_MODULES)
 
  AM_CONDITIONAL([SI_BUILTIN_STATICDEMO], [test x$bi_staticdemo = xtrue])

m4/win-flags.m4

@@ -7 +7 @@
 dnl Maybe necessary for mingw as well but haven't tested
   case $host_os in
-    *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
+    *cygwin* | *mingw*) os_win32=yes;;
+    *) os_win32=no;;
   esac
 
+  AC_SUBST(SINGULAR_LDFLAGS)
+
+  if test x$os_win32 = xyes; then
+    AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic])
 dnl libtool requires "-no-undefined" for win32 dll
-  AC_SUBST(SINGULAR_LDFLAGS)
-  case $host_os in
-    *cygwin* | *mingw*)
-      if test x"$enable_shared" = xyes; then
-        SINGULAR_LDFLAGS="$SINGULAR_LDFLAGS -no-undefined"
-      fi
-    ;;
-  esac
+    SINGULAR_LDFLAGS="$SINGULAR_LDFLAGS -no-undefined"
+  fi
+
+  AM_CONDITIONAL([SING_WIN], [test x$os_win32 = xyes])
 ])