From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 16 Dec 1998 02:28:53 +0000 (+0000)
Subject: 	* ltmain.in (-DSTATIC): changed to -DLIBTOOL_STATIC, and defined
X-Git-Tag: release-1-2d~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64b3cf7ae97249c87d48ad1bd137b173b3d4502b;p=thirdparty%2Flibtool.git

	* 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 c6e22f077..09e618835 100644
--- 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 3f9b92418..5369c39ac 100644
--- 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"