# HG changeset patch
# User jwe
# Date 1185317633 0
# Node ID 5e4ae36ffdb23966780c4ddd43471149f9631e66
# Parent  9a179efae6bbaab5e4a0f150988b64d758556bc3
[project @ 2007-07-24 22:53:53 by jwe]

diff -r 9a179efae6bb -r 5e4ae36ffdb2 ChangeLog
--- a/ChangeLog	Tue Jul 24 20:42:22 2007 +0000
+++ b/ChangeLog	Tue Jul 24 22:53:53 2007 +0000
@@ -1,3 +1,8 @@
+2007-07-24  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* configure.in (*-*-msdosmsvc): Only add -g to DL_LDFLAGS and
+	SH_LDFLAGS if either CFLAGS or CXXFLAGS contains -g.
+
 2007-07-24  Rafael Laboissiere  <rafael@debian.org>
 
 	* Makeconf.in (RUNTEST): Delete variable substitution.
diff -r 9a179efae6bb -r 5e4ae36ffdb2 configure.in
--- a/configure.in	Tue Jul 24 20:42:22 2007 +0000
+++ b/configure.in	Tue Jul 24 22:53:53 2007 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.567 $)
+AC_REVISION($Revision: 1.568 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1135,7 +1135,7 @@
     library_path_var=PATH
   ;;
   *-*-msdosmsvc)
-    DL_LDFLAGS="-shared -g"
+    DL_LDFLAGS="-shared"
     CPICFLAG=
     CXXPICFLAG=
     FPICFLAG=
@@ -1143,7 +1143,11 @@
     SHLLIB=lib
     SHLBIN=dll
     LIBPRE=
-    SH_LDFLAGS="-shared -g"
+    SH_LDFLAGS="-shared"
+      if test -n "`echo $CFLAGS | grep -e '-g'`" -o -n "`echo $CXXFLAGS | grep -e '-g'`"; then
+      DL_LDFLAGS="$DL_LDFLAGS -g"
+      SH_LDFLAGS="$SH_LDFLAGS -g"
+    fi
     NO_OCT_FILE_STRIP=true
     library_path_var=PATH
     NO_OCT_FILE_STRIP=true