--- a/configure.in	Fri Feb 13 23:01:34 2004 +0000
+++ b/configure.in	Sun Feb 15 00:08:07 2004 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.443 $)
+AC_REVISION($Revision: 1.444 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -665,7 +665,9 @@
 SHLLINKEXT=
 SH_LD='$(CXX)'
 SH_LDFLAGS=-shared
-MKOCTFILE_SH_LDFLAGS='$(SH_LDFLAGS)'
+DL_LD='$(SH_LD)'
+DL_LDFLAGS='$(SH_LDFLAGS)'
+MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
 SONAME_FLAGS=
 RLD_FLAG=
 NO_OCT_FILE_STRIP=false
@@ -690,13 +692,19 @@
     RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
   ;;
   *-*-darwin*)
-    SH_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave'
-    MKOCTFILE_SH_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
+    DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
+    MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
+    SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
     CXXPICFLAG=
     CPICFLAG=
     FPICFLAG=
+    SHLEXT=dylib 
+    SHLLIB='$(SHLEXT)'
+    SHLEXT_VER='$(version).$(SHLEXT)'
+    SHLLIB_VER='$(version).$(SHLLIB)'
     INCLUDE_LINK_DEPS=true
     NO_OCT_FILE_STRIP=true
+    library_path_var=DYLD_LIBRARY_PATH	
   ;;
   *-*-cygwin* | *-*-mingw*)
     CXXPICFLAG=
@@ -802,7 +810,9 @@
 AC_MSG_RESULT([defining DLFCN_DIR to be $DLFCN_DIR])
 AC_MSG_RESULT([defining SH_LD to be $SH_LD])
 AC_MSG_RESULT([defining SH_LDFLAGS to be $SH_LDFLAGS])
-AC_MSG_RESULT([defining MKOCTFILE_SH_LDFLAGS to be $MKOCTFILE_SH_LDFLAGS])
+AC_MSG_RESULT([defining DL_LD to be $DL_LD])
+AC_MSG_RESULT([defining DL_LDFLAGS to be $DL_LDFLAGS])
+AC_MSG_RESULT([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
 AC_MSG_RESULT([defining SONAME_FLAGS to be $SONAME_FLAGS])
 AC_MSG_RESULT([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
 AC_MSG_RESULT([defining RLD_FLAG to be $RLD_FLAG])
@@ -823,7 +833,9 @@
 AC_SUBST(DLFCN_DIR)
 AC_SUBST(SH_LD)
 AC_SUBST(SH_LDFLAGS)
-AC_SUBST(MKOCTFILE_SH_LDFLAGS)
+AC_SUBST(DL_LD)
+AC_SUBST(DL_LDFLAGS)
+AC_SUBST(MKOCTFILE_DL_LDFLAGS)
 AC_SUBST(SONAME_FLAGS)
 AC_SUBST(NO_OCT_FILE_STRIP)
 AC_SUBST(RLD_FLAG)