From 25d0687a6e22eccd26caae51a1a02155db5fa940 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Tue, 6 Nov 2001 05:44:09 +0000
Subject: [PATCH] Merged WXMSW_DLL_DEFINES and PICFLAGS, since they essentially
 do the same thing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in  | 6 +++---
 configure    | 8 +++-----
 configure.in | 7 ++-----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 851d39760a..63b817ff70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,13 +17,13 @@ include ./src/make.env
 ############## override make.env for PIC ##########################
 
 %.o : %.c
-	$(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
 %.o : %.cpp
-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 %.o : %.cxx
-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 %.r : %.rsrc
 	$(DEREZ) $^ Carbon.r -useDF > $@
diff --git a/configure b/configure
index 4e9953ba74..07e66ed7b0 100755
--- a/configure
+++ b/configure
@@ -11909,7 +11909,8 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
-        WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+
+        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
                 if test "$wxUSE_OPENGL" = "yes"; then
             WX_ALL_INSTALLED="preinstall_gl"
@@ -11917,7 +11918,6 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
         else
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
-                        PIC_FLAG=
       ;;
 
       *-pc-os2_emx | *-pc-os2-emx )
@@ -18401,11 +18401,10 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
-
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:18409: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18408: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18679,7 +18678,6 @@ s%@EXTRA_LIBS@%$EXTRA_LIBS%g
 s%@OPENGL_LIBS@%$OPENGL_LIBS%g
 s%@EXTRADEFS@%$EXTRADEFS%g
 s%@LD_LIBS@%$LD_LIBS%g
-s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g
 s%@RESFLAGS@%$RESFLAGS%g
 s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
 s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g
diff --git a/configure.in b/configure.in
index 3610af5202..be2d7171b5 100644
--- a/configure.in
+++ b/configure.in
@@ -2519,7 +2519,8 @@ if test "$wxUSE_SHARED" = "yes"; then
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
-        WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+
+        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
         dnl install shared libs without symlinks
         if test "$wxUSE_OPENGL" = "yes"; then
@@ -2528,9 +2529,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         else
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
-        dnl -fPIC is not required for mingw build -- all code is already
-        dnl position independent.
-        PIC_FLAG=
       ;;
 
       *-pc-os2_emx | *-pc-os2-emx )
@@ -4768,7 +4766,6 @@ AC_SUBST(OPENGL_LIBS)
 AC_SUBST(EXTRADEFS)
 AC_SUBST(LIBS)
 AC_SUBST(LD_LIBS)
-AC_SUBST(WXMSW_DLL_DEFINES)
 
 dnl additional resurces settings
 AC_SUBST(RESCOMP)