Mercurial > hg > octave-thorsten

changeset 14295:21572e9bd365

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make --disable-dl work again * src/DLD-FUNCTIONS/config-module.awk: Emit $(DLD_LIBOCTINTERP_LIBADD) instead of liboctinterp.la. * src/Makefile.am (DLD_LIBOCTINTERP_LIBADD): Only define if AMCOND_ENABLE_DYNAMIC_LINKING is true.
author John W. Eaton <jwe@octave.org>
date Tue, 31 Jan 2012 00:03:37 -0500
parents 9e3983c8963c
children 6cb3b158e973
files src/DLD-FUNCTIONS/config-module.awk src/Makefile.am
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/config-module.awk
+++ b/src/DLD-FUNCTIONS/config-module.awk
@@ -71,7 +71,7 @@
       }
     printf ("DLD_FUNCTIONS_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n",
             basename, ldflags[i]);
-    printf ("DLD_FUNCTIONS_%s_la_LIBADD = liboctinterp.la ../liboctave/liboctave.la ../libcruft/libcruft.la %s $(OCT_LINK_DEPS)\n",
+    printf ("DLD_FUNCTIONS_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libcruft/libcruft.la %s $(OCT_LINK_DEPS)\n",
             basename, libraries[i]);
   }
 }
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -484,9 +484,11 @@
 if AMCOND_ENABLE_DYNAMIC_LINKING
   OCT_FILES = $(DLD_FUNCTIONS_LIBS:.la=.oct)
   OCT_STAMP_FILES = $(subst DLD-FUNCTIONS/,DLD-FUNCTIONS/$(am__leading_dot),$(DLD_FUNCTIONS_LIBS:.la=.oct-stamp))
+  DLD_LIBOCTINTERP_LIBADD = liboctinterp.la
 else
   OCT_FILES =
   OCT_STAMP_FILES =
+  DLD_LIBOCTINTERP_LIBADD =
 endif
 
 liboctinterp_la_SOURCES = \