summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2010-07-23 13:48:34 +0200
committerStephen Gallagher <sgallagh@redhat.com>2010-08-03 13:50:28 -0400
commitcaf595fa084d2e54dc82ca1a5659ce423b85ca0f (patch)
tree7d337c23e1717a2d29426d9f5db89418781f8834
parent2f4e8fbdf1d4ba1e00fcab93af91fe4f4f40250d (diff)
downloadsssd-caf595fa084d2e54dc82ca1a5659ce423b85ca0f.tar.gz
sssd-caf595fa084d2e54dc82ca1a5659ce423b85ca0f.tar.xz
sssd-caf595fa084d2e54dc82ca1a5659ce423b85ca0f.zip
Fix two problems with --as-needed
-rw-r--r--src/Makefile.am1
-rw-r--r--src/configure.ac6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 79fcbb9d6..2e4413e5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -756,6 +756,7 @@ libsss_ldap_la_CFLAGS = \
$(KRB5_CFLAGS)
libsss_ldap_la_LIBADD = \
$(OPENLDAP_LIBS) \
+ $(DHASH_LIBS) \
$(KRB5_LIBS)
libsss_ldap_la_LDFLAGS = \
-version-info 1:0:0 \
diff --git a/src/configure.ac b/src/configure.ac
index 8a2a95f82..5da27a0eb 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -108,12 +108,12 @@ if ! $PKG_CONFIG --atleast-version 1.0.0 dbus-1; then
fi
if test x$has_dbus != xno; then
- SAFE_LDFLAGS="$LDFLAGS"
- LDFLAGS="$DBUS_LIBS"
+ SAFE_LIBS="$LIBS"
+ LIBS="$DBUS_LIBS"
AC_CHECK_FUNC([dbus_watch_get_unix_fd],
AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD], [1],
[Define if dbus_watch_get_unix_fd exists]))
- LDFLAGS="$SAFE_LDFLAGS"
+ LIBS="$SAFE_LIBS"
fi
if test x$HAVE_MANPAGES != x; then