corrected static library configuration for Darwin/Mac OS X

Mac OS X resource related corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -26,7 +26,7 @@ include ./src/make.env
 	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
 %.r : %.rsrc
-	$(DEREZ) $^ Carbon.r --useDF > $@
+	$(DEREZ) $^ Carbon.r -useDF > $@
 
 ########################### Paths #################################
 
@@ -331,7 +331,7 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o $(build_libdir)/@WX_LIB
 	@$(INSTALL) -d $(build_libdir)
 	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
 
-$(build_libdir)/@WX_RESOURCES_DARWIN@: $(MACRESOURCES)
+$(build_libdir)/@WX_RESOURCES_MACOSX@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)
 	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
 

configure.in

@@ -558,12 +558,14 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
-  *-*-darwin* )
+  powerpc-*-darwin* )
+    dnl PowerPC Darwin based distributions (including Mac OS X)
     USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib
     AC_DEFINE(__BSD__)
     AC_DEFINE(__DARWIN__)
+    AC_DEFINE(__POWERPC__)
     DEFAULT_DEFAULT_wxUSE_MAC=1
   ;;
 
@@ -1946,6 +1948,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
     dnl we can't call this MAC_DIST or autoconf thinks its a macro
     if test "$wxUSE_MAC" = 1; then
+        CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+        CFLAGS="${CFLAGS} -fpascal-strings"
+        CXXFLAGS="${CXXFLAGS} -fpascal-strings"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
+
         TOOLKIT=MAC
         GUIDIST=MACX_DIST
     fi
@@ -2120,8 +2127,8 @@ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
 WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
 WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
 
-dnl the name of the resources file for wxMAC
+dnl the name of the resources file for wxMac
-WX_RESOURCES_DARWIN="lib${WX_LIBRARY}.rsrc"
+WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
 
 
 dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
@@ -2198,24 +2205,10 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
 
       *-*-darwin* )
-        dnl FIXME: do we need __UNIX__ here?  It's already defined above
+        CFLAGS="${CFLAGS} -fno-common"
-        dnl for darwin right??
+        CXXFLAGS="${CXXFLAGS} -fno-common"
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
-        CPPFLAGS="${CPPFLAGS} -fno-common"
         SHARED_LD="${CXX} -dynamiclib -o"
         PIC_FLAG="-dynamic -fPIC"
-
-        dnl add the resources target for wxMac
-        if test "$wxUSE_MAC" = 1 ; then
-            WX_ALL="${WX_ALL} lib${WX_LIBRARY}.r"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
-            CPPFLAGS="${CPPFLAGS} -fpascal-strings"
-            CXXFLAGS="${CXXFLAGS} -cpp-precomp"
-            AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
-            AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
-            LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
-            LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
-        fi
       ;;
 
       *-*-aix* )
@@ -2299,6 +2292,15 @@ if test "$wxUSE_SHARED" = "no"; then
     WX_TARGET_LIBRARY_TYPE="a"
 fi
 
+if test "$wxUSE_MAC" = 1; then
+    dnl add the resources target for wxMac
+    WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+    AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+    AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
+    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+fi
+
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -2701,7 +2703,12 @@ dnl get the library function to use for wxGetDiskSpace()
 AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
     AC_TRY_COMPILE(
         [
+             #ifdef __DARWIN__
+               #include <sys/param.h>
+               #include <sys/mount.h>
+             #else
                #include <sys/vfs.h>
+             #endif
         ],
         [
              long l;
@@ -3122,8 +3129,7 @@ if test "$GCC" = yes ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
     if test "$wxUSE_NO_DEPS" = "no" ; then
-        CFLAGS="-MMD ${CFLAGS}"
+        CPPFLAGS="-MMD ${CPPFLAGS}"
-        CXXFLAGS="-MMD ${CXXFLAGS}"
     fi
     if test "$USE_WIN32" = 1 ; then
         # I'm not even really sure what this was ever added to solve,
@@ -4543,7 +4549,7 @@ dnl additional resurces settings
 AC_SUBST(RESCOMP)
 AC_SUBST(RESFLAGS)
 AC_SUBST(RESPROGRAMOBJ)
-AC_SUBST(WX_RESOURCES_DARWIN)
+AC_SUBST(WX_RESOURCES_MACOSX)
 
 dnl additional for Mac OS X
 AC_SUBST(DEREZ)