|
 |
343dbcc |
|
|
|
343dbcc |
- don't export libs needed for DBD
|
|
|
343dbcc |
- don't add -L%{_libdir} to --link-ld output
|
|
|
343dbcc |
|
|
|
343dbcc |
--- apr-util-1.2.2/build/dbd.m4.exports
|
|
|
343dbcc |
+++ apr-util-1.2.2/build/dbd.m4
|
|
|
343dbcc |
@@ -64,7 +64,6 @@
|
|
|
343dbcc |
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
|
|
|
343dbcc |
dnl we know the library is there.
|
|
|
343dbcc |
if test "$apu_have_pgsql" = "1"; then
|
|
|
343dbcc |
- APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lpq])
|
|
|
343dbcc |
APR_ADDTO(APRUTIL_LIBS,[-lpq])
|
|
|
343dbcc |
fi
|
|
|
343dbcc |
])
|
|
|
343dbcc |
@@ -115,7 +114,6 @@
|
|
|
343dbcc |
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
|
|
|
343dbcc |
dnl we know the library is there.
|
|
|
343dbcc |
if test "$apu_have_mysql" = "1"; then
|
|
|
343dbcc |
- APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lmysqlclient_r])
|
|
|
343dbcc |
APR_ADDTO(APRUTIL_LIBS,[-lmysqlclient_r])
|
|
|
343dbcc |
fi
|
|
|
343dbcc |
])
|
|
|
343dbcc |
@@ -152,7 +150,6 @@
|
|
|
343dbcc |
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
|
|
|
343dbcc |
dnl we know the library is there.
|
|
|
343dbcc |
if test "$apu_have_sqlite3" = "1"; then
|
|
|
343dbcc |
- APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lsqlite3])
|
|
|
343dbcc |
APR_ADDTO(APRUTIL_LIBS,[-lsqlite3])
|
|
|
343dbcc |
fi
|
|
|
343dbcc |
])
|
|
|
343dbcc |
@@ -189,7 +186,6 @@
|
|
|
343dbcc |
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
|
|
|
343dbcc |
dnl we know the library is there.
|
|
|
343dbcc |
if test "$apu_have_sqlite2" = "1"; then
|
|
|
343dbcc |
- APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lsqlite])
|
|
|
343dbcc |
APR_ADDTO(APRUTIL_LIBS,[-lsqlite])
|
|
|
343dbcc |
fi
|
|
|
343dbcc |
])
|
|
|
343dbcc |
--- apr-util-1.2.2/apu-config.in.exports
|
|
|
343dbcc |
+++ apr-util-1.2.2/apu-config.in
|
|
|
343dbcc |
@@ -147,8 +147,10 @@
|
|
|
343dbcc |
;;
|
|
|
343dbcc |
--link-ld)
|
|
|
343dbcc |
if test "$location" = "installed"; then
|
|
|
343dbcc |
- ### avoid using -L if libdir is a "standard" location like /usr/lib
|
|
|
343dbcc |
- flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
|
|
|
343dbcc |
+ if test "$prefix" != "/usr"; then
|
|
|
343dbcc |
+ flags="$flags -L${libdir}"
|
|
|
343dbcc |
+ fi
|
|
|
343dbcc |
+ flags="$flags -l$APRUTIL_LIBNAME"
|
|
|
343dbcc |
else
|
|
|
343dbcc |
flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
|
|
|
343dbcc |
fi
|