# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1327986217 18000
# Node ID 21572e9bd365e990de0ee2cef58dfb07cc4cdcd2
# Parent  9e3983c8963c2eb36abf4a57827cd1f4df5018f0
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.

diff -r 9e3983c8963c -r 21572e9bd365 src/DLD-FUNCTIONS/config-module.awk
--- a/src/DLD-FUNCTIONS/config-module.awk	Mon Jan 30 23:42:41 2012 -0500
+++ b/src/DLD-FUNCTIONS/config-module.awk	Tue Jan 31 00:03:37 2012 -0500
@@ -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]);
   }
 }
diff -r 9e3983c8963c -r 21572e9bd365 src/Makefile.am
--- a/src/Makefile.am	Mon Jan 30 23:42:41 2012 -0500
+++ b/src/Makefile.am	Tue Jan 31 00:03:37 2012 -0500
@@ -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 = \