X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/480ccd2194ae492b878e1659b99d0108157eae01..852a8f8b532510da1e0a4e802f8ef84a6217e7a3:/configure.in

diff --git a/configure.in b/configure.in
index 107823cab3..a06af8e7ba 100644
--- a/configure.in
+++ b/configure.in
@@ -1367,6 +1367,7 @@ if test "x$wx_cv_c_exto" '!=' "x"; then
     _AC_PROG_CC_G
 fi
 AC_BAKEFILE_PROG_MWCC
+AC_WX_PROG_XLCC
 
 dnl is -traditional needed for correct compilations
 dnl   adds -traditional for gcc if needed
@@ -1390,6 +1391,7 @@ if test "x$wx_cv_cxx_exto" '!=' "x"; then
     _AC_PROG_CXX_G
 fi
 AC_BAKEFILE_PROG_MWCXX
+AC_WX_PROG_XLCXX
 
 AC_LANG_RESTORE
 
@@ -1504,6 +1506,13 @@ dnl ------------------------------------------------------------------------
 dnl Platform specific tests
 dnl ------------------------------------------------------------------------
 
+dnl xlC needs -qunique (at least on AIX) so that one source file can be
+dnl compiled to multiple object files and safely linked together.
+if test "x$XLCXX" = "xyes"; then
+    CXXFLAGS="$CXXFLAGS -qunique"
+fi
+
+
 dnl This case is for OS X vs. everything else
 case "${host}" in
   powerpc-*-darwin* )
@@ -1604,9 +1613,10 @@ case "${host}" in
       if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
         AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
         wxUSE_OMF=yes
+	enable_omf=yes
       fi
       if test "$wxUSE_OMF" = "yes"; then
-        LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+        LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
       fi
       dnl (end of OS/2-only piece)
   ;;