--- a/configure.in	Thu May 23 20:28:56 2002 +0000
+++ b/configure.in	Fri May 24 05:29:58 2002 +0000
@@ -22,7 +22,7 @@
 ### 02111-1307, USA. 
 
 AC_INIT
-AC_REVISION($Revision: 1.358 $)
+AC_REVISION($Revision: 1.359 $)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -290,6 +290,13 @@
 ### We do our own template instantiation for specific compilers.
 
 if test "$cxx_auto_instantiate_templates" = no; then
+  case "$canonical_host_type" in
+    *-*-darwin*)
+      OCTAVE_CXX_FLAG(-fno-coalesce-templates, [
+	XTRA_CXXFLAGS="$XTRA_CXXFLAGS -fno-coalesce-templates"
+	AC_MSG_RESULT([adding -fno-coalesce-templates to XTRA_CXXFLAGS])])
+    ;;
+  esac
   OCTAVE_CXX_FLAG(-fno-implicit-templates, [
     XTRA_CXXFLAGS="$XTRA_CXXFLAGS -fno-implicit-templates"
     AC_MSG_RESULT([adding -fno-implicit-templates to XTRA_CXXFLAGS])])
@@ -636,6 +643,9 @@
     SONAME_FLAGS='-Xlinker -soname -Xlinker $@'
     RLD_FLAG='-Xlinker -rpath -Xlinker $(octlibdir)'
   ;;
+  *-*-darwin*)
+    SH_LDFLAGS='-bundle -bundle_loader $(bindir)/octave'
+  ;;
   *-*-linux* | *-*-gnu*)
     SONAME_FLAGS='-Xlinker -soname -Xlinker $@'
     RLD_FLAG='-Xlinker -rpath -Xlinker $(octlibdir)'
@@ -888,7 +898,13 @@
     ;;
   esac
   if $WITH_DL; then
-    OCTAVE_CXX_FLAG(-rdynamic, [RDYNAMIC_FLAG=-rdynamic])
+    case "$canonical_host_type" in
+      *-*-darwin*)
+      ;;
+      *)
+        OCTAVE_CXX_FLAG(-rdynamic, [RDYNAMIC_FLAG=-rdynamic])
+      ;;
+    esac
     AC_DEFINE(WITH_DL, 1, [Define if using dlopen/dlsym.])
   fi
 else
@@ -1122,7 +1138,19 @@
 ### UGLY_DEFS for that.
 
 AC_OUTPUT_MAKE_DEFS
-UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
+
+
+dnl Maybe this should really be conditional on "broken sed", or
+dnl "broken shell backslash quoting" or somesuch.
+dnl
+case "$canonical_host_type" in
+  *-*-darwin*)
+    UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
+  ;;
+  *)
+    UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
+  ;;
+esac
 AC_MSG_RESULT([defining UGLY_DEFS to be $UGLY_DEFS])
 AC_SUBST(UGLY_DEFS)