* ltmain.in (-DSTATIC): changed to -DLIBTOOL_STATIC, and defined

	only for -force-static; it should be removed soon, before people
	start to use it

diff --git a/ChangeLog b/ChangeLog
index c6e22f077030f2635de73ecb13151ee6b71cd74f..09e618835d48690b018cafb0083459e2f57824fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1998-12-16  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * ltmain.in (-DSTATIC): changed to -DLIBTOOL_STATIC, and defined
+       only for -force-static; it should be removed soon, before people
+       start to use it
+
        * configure.in (AC_CONFIG_SUBDIRS): added libltdl
        * Makefile.am (SUBDIRS): build libltdl by default
        (DIST_SUBDIRS): simplify distribution of demo and mdemo

diff --git a/ltmain.in b/ltmain.in
index 3f9b924184f3a3ca36adaa000204c4c95cff08f6..5369c39acdba34fa477b702429a399779b45bfec 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -499,7 +499,10 @@ compiler."
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
-      command="$base_compile -DSTATIC $srcfile"
+      command="$base_compile $srcfile"
+      if test "$force_static" = yes; then
+        command="$command -DLIBTOOL_STATIC"
+      fi
       if test "$compiler_c_o" = yes; then
         command="$command -o $obj"
         output_obj="$obj"