diff options
| author | Jeff Layton <jlayton@samba.org> | 2012-04-15 08:11:53 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2012-04-15 08:11:53 -0400 |
| commit | ea9407fc4ae72a5d4245cbb25f7429f46d664d23 (patch) | |
| tree | 635a0dbfb311aa60478ef7720c4733676c32b072 /Makefile.am | |
| parent | fd31a7c0ba7f1282d2d81193d4d100fdc926b99b (diff) | |
| download | cifs-utils-ea9407fc4ae72a5d4245cbb25f7429f46d664d23.tar.gz cifs-utils-ea9407fc4ae72a5d4245cbb25f7429f46d664d23.tar.bz2 cifs-utils-ea9407fc4ae72a5d4245cbb25f7429f46d664d23.zip | |
autoconf: fix tests for wbclient to use pkgconfig
Use the pkgconfig file that's included with wbclient to perform the test
for wbclient usability, and to set the correct CFLAGS and LDADD.
This is particularly necessary on recent Fedora with samba4 since it
puts the wbclient.h file in a different directory than before.
Also, remove a redundant test for wbclient.h from configure.ac.
Signed-off-by: Jeff Layton <jlayton@samba.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 924c99e..17ad8e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,8 @@ endif if CONFIG_CIFSIDMAP sbin_PROGRAMS += cifs.idmap cifs_idmap_SOURCES = cifs.idmap.c -cifs_idmap_LDADD = -lkeyutils $(WINB_LDADD) +cifs_idmap_LDADD = -lkeyutils $(WBCLIENT_LIBS) +cifs_idmap_CFLAGS = $(WBCLIENT_CFLAGS) man_MANS += cifs.idmap.8 cifs.idmap.8: cifs.idmap.8.in @@ -56,12 +57,14 @@ endif if CONFIG_CIFSACL bin_PROGRAMS += getcifsacl getcifsacl_SOURCES = getcifsacl.c -getcifsacl_LDADD = $(WINB_LDADD) +getcifsacl_LDADD = $(WBCLIENT_LIBS) +getcifsacl_CFLAGS = $(WBCLIENT_CFLAGS) man_MANS += getcifsacl.1 bin_PROGRAMS += setcifsacl setcifsacl_SOURCES = setcifsacl.c -setcifsacl_LDADD = $(WINB_LDADD) +setcifsacl_LDADD = $(WBCLIENT_LIBS) +setcifsacl_CFLAGS = $(WBCLIENT_CFLAGS) man_MANS += setcifsacl.1 endif |