diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-14 17:40:07 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:06:50 +0100 |
| commit | 2ec1b6cca5a52be5829e7c14e0ade052275a9db2 (patch) | |
| tree | 2ed489542e6d32a3f9e1e79746f381e8708d14ba | |
| parent | 44a7524ddebd6fbc22a17b9aa4d0ee8d86113eec (diff) | |
| download | dbus-2ec1b6cca5a52be5829e7c14e0ade052275a9db2.tar.gz | |
Substitute cflags/libs per-library
This means each module can link whatever it needs to, localizing the
knowledge of which module needs which libraries into its own
Makefile.am.
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3dc4f40b..0b45e372 100644 --- a/configure.ac +++ b/configure.ac @@ -890,6 +890,8 @@ if $dbus_use_libxml; then XML_LIBS=$LIBXML_LIBS XML_CFLAGS=$LIBXML_CFLAGS fi +AC_SUBST([XML_CFLAGS]) +AC_SUBST([XML_LIBS]) # Thread lib detection AC_CHECK_FUNC(pthread_cond_timedwait,[AC_CHECK_LIB(pthread,pthread_cond_timedwait, @@ -920,6 +922,8 @@ fi fi LIBS="$save_libs" +AC_SUBST([THREAD_LIBS]) + # SELinux detection if test x$enable_selinux = xno ; then have_selinux=no; @@ -1087,7 +1091,9 @@ if test x$have_libaudit = xyes ; then AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) fi -# Check for ADT API +AC_SUBST([SELINUX_LIBS]) + +# Check for ADT API (Solaris Basic Security Mode auditing) AC_MSG_CHECKING(for ADT API) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <bsm/adt.h> @@ -1103,6 +1109,7 @@ then else AC_MSG_RESULT(no) fi +AC_SUBST([ADT_LIBS]) # Check for SCM_RIGHTS AC_MSG_CHECKING([for SCM_RIGHTS]) @@ -1124,6 +1131,8 @@ if test x$dbus_win = xyes ; then fi fi +AC_SUBST([NETWORK_libs]) + #### Set up final flags DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs" AC_SUBST(DBUS_CLIENT_LIBS) |