diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2011-12-02 11:59:20 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-12-05 13:49:58 -0500 |
| commit | d488258da8c9d419af6d8ac4f88732b6494455c4 (patch) | |
| tree | a3000643d499856820d0e5fd198d0a98fb817e7a /Makefile.am | |
| parent | 46dfa69060f22a443d4ad9d2bf34441ff1adf2d3 (diff) | |
| download | sssd-d488258da8c9d419af6d8ac4f88732b6494455c4.tar.gz sssd-d488258da8c9d419af6d8ac4f88732b6494455c4.tar.xz sssd-d488258da8c9d419af6d8ac4f88732b6494455c4.zip | |
Allow using Glib for UTF8 support
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 87def30b2..17d3dd6af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,8 @@ pubconfpath = @pubconfpath@ pkgconfigdir = $(libdir)/pkgconfig krb5rcachedir = @krb5rcachedir@ +UNICODE_LIBS=@UNICODE_LIBS@ + AM_CFLAGS = if WANT_AUX_INFO AM_CFLAGS += -aux-info $@.X @@ -118,7 +120,8 @@ krb5plugin_LTLIBRARIES = \ endif noinst_LTLIBRARIES = \ - libsss_crypt.la + libsss_crypt.la \ + libsss_utf8.la if HAVE_NSS SSS_CRYPT_SOURCES = src/util/crypto/nss/nss_sha512crypt.c \ @@ -141,6 +144,9 @@ libsss_crypt_la_CFLAGS = \ libsss_crypt_la_LIBADD = \ $(SSS_CRYPT_LIBS) +libsss_utf8_la_SOURCES = src/util/sss_utf8.c +libsss_utf8_la_LIBADD = $(UNICODE_LIBS) + if BUILD_PYTHON_BINDINGS pyexec_LTLIBRARIES = \ pysss.la \ @@ -188,6 +194,7 @@ AM_CPPFLAGS = \ $(INI_CONFIG_CFLAGS) \ $(DHASH_CFLAGS) \ $(LIBNL_CFLAGS) \ + $(GLIB2_CFLAGS) \ -DLIBDIR=\"$(libdir)\" \ -DVARDIR=\"$(localstatedir)\" \ -DSHLIBEXT=\"$(SHLIBEXT)\" \ @@ -268,7 +275,8 @@ SSSD_LIBS = \ $(SSS_CRYPT_LIBS) \ $(OPENLDAP_LIBS) \ $(TDB_LIBS) \ - libsss_crypt.la + libsss_crypt.la \ + libsss_utf8.la PYTHON_BINDINGS_LIBS = \ $(TALLOC_LIBS) \ @@ -293,8 +301,9 @@ TOOLS_LIBS = \ $(INI_CONFIG_LIBS) \ $(COLLECTION_LIBS) \ $(DHASH_LIBS) \ - $(OPENLDAP_LIBS) \ - $(TDB_LIBS) \ + $(OPENLDAP_LIBS) \ + $(TDB_LIBS) \ + $(UNICODE_LIBS) \ libsss_crypt.la if BUILD_SELINUX @@ -315,6 +324,7 @@ dist_noinst_HEADERS = \ src/util/sss_ldap.h \ src/util/sss_python.h \ src/util/sss_krb5.h \ + src/util/sss_utf8.h \ src/util/refcount.h \ src/util/find_uid.h \ src/util/user_info_msg.h \ @@ -367,14 +377,13 @@ if HAVE_NSS dist_noinst_HEADERS += src/util/crypto/nss/nss_util.h endif - lib_LTLIBRARIES = libipa_hbac.la dist_pkgconfig_DATA += src/providers/ipa/ipa_hbac.pc libipa_hbac_la_SOURCES = \ src/providers/ipa/hbac_evaluator.c libipa_hbac_la_LDFLAGS = \ - -version 1:0:1 \ - -lunistring + -version 1:0:1 +libipa_hbac_la_LIBADD = libsss_utf8.la include_HEADERS = \ src/providers/ipa/ipa_hbac.h @@ -399,8 +408,7 @@ sssd_nss_SOURCES = \ $(SSSD_RESPONDER_OBJ) sssd_nss_LDADD = \ $(TDB_LIBS) \ - $(SSSD_LIBS) \ - -lunistring + $(SSSD_LIBS) sssd_pam_SOURCES = \ src/responder/pam/pam_LOCAL_domain.c \ @@ -411,8 +419,7 @@ sssd_pam_SOURCES = \ $(SSSD_RESPONDER_OBJ) sssd_pam_LDADD = \ $(TDB_LIBS) \ - $(SSSD_LIBS) \ - -lunistring + $(SSSD_LIBS) sssd_be_SOURCES = \ src/providers/data_provider_be.c \ |