svn commit: r1372546 - in /apr/apr-util/branches/1.5.x: CHANGES configure.in include/apu.h.in test/Makefile.in

[tr...@apache.org]

Author: trawick
Date: Mon Aug 13 18:45:30 2012
New Revision: 1372546

URL: http://svn.apache.org/viewvc?rev=1372546&view=rev
Log:
MinGW: Support shared builds of apr-util when apr is shared.

PR: 46175
Submitted by: Carlo Bramini <carlo.bramix libero.it>, trawick

Modified:
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/configure.in
    apr/apr-util/branches/1.5.x/include/apu.h.in
    apr/apr-util/branches/1.5.x/test/Makefile.in

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1372546&r1=1372545&r2=1372546&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Mon Aug 13 18:45:30 2012
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.1
 
+  *) MinGW: Support shared builds of apr-util when apr is shared.
+     PR 46175.  [Carlo Bramini <carlo.bramix libero.it>, Jeff Trawick]
+
   *) Add support for Berkeley DB 5.2 and 5.3. Simplify detection skript.
      PR 53684.  [Rainer Jung]
 

Modified: apr/apr-util/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/configure.in?rev=1372546&r1=1372545&r2=1372546&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/configure.in (original)
+++ apr/apr-util/branches/1.5.x/configure.in Mon Aug 13 18:45:30 2012
@@ -222,7 +222,11 @@ dnl copy apr's rules.mk into our build d
 if test ! -d ./build; then
    $mkdir_p build
 fi
-cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
+dnl
+dnl MinGW: If APR is shared, APR_DECLARE_EXPORT will be defined in the
+dnl        internal CPPFLAGS, but APR-Util needs APU_DECLARE_EXPORT instead.
+dnl
+sed -e 's/-DAPR_DECLARE_EXPORT/-DAPU_DECLARE_EXPORT/' < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
 
 dnl
 dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles

Modified: apr/apr-util/branches/1.5.x/include/apu.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apu.h.in?rev=1372546&r1=1372545&r2=1372546&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apu.h.in (original)
+++ apr/apr-util/branches/1.5.x/include/apu.h.in Mon Aug 13 18:45:30 2012
@@ -42,6 +42,7 @@
  * conventions at compile time.
  */
 
+#if defined(DOXYGEN) || !defined(WIN32)
 /**
  * The public APR-UTIL functions are declared with APU_DECLARE(), so they may
  * use the most appropriate calling convention.  Public APR functions with 
@@ -66,6 +67,19 @@
  * declarations within headers to properly import the variable.
  */
 #define APU_DECLARE_DATA
+#elif defined(APU_DECLARE_STATIC)
+#define APU_DECLARE(type)            type __stdcall
+#define APU_DECLARE_NONSTD(type)     type __cdecl
+#define APU_DECLARE_DATA
+#elif defined(APU_DECLARE_EXPORT)
+#define APU_DECLARE(type)            __declspec(dllexport) type __stdcall
+#define APU_DECLARE_NONSTD(type)     __declspec(dllexport) type __cdecl
+#define APU_DECLARE_DATA             __declspec(dllexport)
+#else
+#define APU_DECLARE(type)            __declspec(dllimport) type __stdcall
+#define APU_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
+#define APU_DECLARE_DATA             __declspec(dllimport)
+#endif
 
 #if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
 /**

Modified: apr/apr-util/branches/1.5.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/Makefile.in?rev=1372546&r1=1372545&r2=1372546&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/Makefile.in (original)
+++ apr/apr-util/branches/1.5.x/test/Makefile.in Mon Aug 13 18:45:30 2012
@@ -34,7 +34,7 @@ APRUTIL_LDFLAGS = $(ALL_LDFLAGS) @LT_NO_
 
 # link programs using -no-install to get real executables not
 # libtool wrapper scripts which link an executable when first run.
-LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
 	    $(APRUTIL_LDFLAGS) -o $@
 
 # STDTEST_PORTABLE;