Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

[dd3271]: apr-util / plugins.patch Maximize Restore History

Download this file

plugins.patch    65 lines (54 with data), 2.4 kB

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
From: David Rothenberger <d.rothenberger@entomo.com>
---
Makefile.in | 2 +-
dbd/apr_dbd.c | 2 +-
dbm/apr_dbm.c | 2 +-
ldap/apr_ldap_stub.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 963fead..c9827de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,7 @@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
APU_MODULES = @APU_MODULES@
-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -no-undefined -rpath $(APU_DSO_LIBDIR) @abs_builddir@/lib@APRUTIL_LIBNAME@.la $(APRUTIL_LIBS)
APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
LT_VERSION = @APU_LTVERSION@
diff --git a/dbd/apr_dbd.c b/dbd/apr_dbd.c
index 49553f2..664b441 100644
--- a/dbd/apr_dbd.c
+++ b/dbd/apr_dbd.c
@@ -184,7 +184,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
#if defined(NETWARE)
apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(CYGWIN) || defined(MSYS)
apr_snprintf(modname, sizeof(modname),
"apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
#else
diff --git a/dbm/apr_dbm.c b/dbm/apr_dbm.c
index 5c506fc..a5beead 100644
--- a/dbm/apr_dbm.c
+++ b/dbm/apr_dbm.c
@@ -162,7 +162,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable,
#if defined(NETWARE)
apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(CYGWIN) || defined(MSYS)
apr_snprintf(modname, sizeof(modname),
"apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type);
#else
diff --git a/ldap/apr_ldap_stub.c b/ldap/apr_ldap_stub.c
index 97c1551..9df76b7 100644
--- a/ldap/apr_ldap_stub.c
+++ b/ldap/apr_ldap_stub.c
@@ -45,7 +45,7 @@ static apr_status_t load_ldap(apr_pool_t *pool)
return rv;
}
-#if defined(WIN32)
+#if defined(WIN32) || defined(CYGWIN) || defined(MSYS)
modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll";
#else
modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so";