]>
Commit | Line | Data |
---|---|---|
1 | --- adminutil-1.1.6/Makefile.am.orig 2007-10-11 04:32:43.000000000 +0200 | |
2 | +++ adminutil-1.1.6/Makefile.am 2008-07-21 22:04:32.156744273 +0200 | |
3 | @@ -19,7 +19,8 @@ | |
4 | #------------------------ | |
5 | NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4 | |
6 | NSS_LINK = @nss_lib@ -lssl3 -lnss3 | |
7 | -LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60 | |
8 | +LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 | |
9 | +LDAPSDK_NOSSL_LINK = @ldapsdk_lib@ -lldap60 -lprldap60 | |
10 | if enable_tests | |
11 | SASL_LINK = @sasl_lib@ -lsasl2 | |
12 | endif | |
13 | @@ -44,7 +45,7 @@ | |
14 | TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite | |
15 | ||
16 | TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@ | |
17 | -TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) | |
18 | +TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(ICU_LINK) | |
19 | ||
20 | retrieveSIE_SOURCES = tests/retrieveSIE.c | |
21 | retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS) | |
22 | @@ -123,7 +124,7 @@ | |
23 | lib/libadminutil/uginfo.c | |
24 | ||
25 | libadminutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@ | |
26 | -libadminutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) | |
27 | +libadminutil_la_LIBADD = $(NSPR_LINK) $(LDAPSDK_NOSSL_LINK) $(ICU_LINK) | |
28 | libadminutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION)) | |
29 | if CXXLINK_REQUIRED | |
30 | libadminutil_la_LINK = $(CXXLINK) | |
31 | @@ -143,7 +144,7 @@ | |
32 | lib/libadmsslutil/uginfossl.c | |
33 | ||
34 | libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@ | |
35 | -libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) libadminutil.la | |
36 | +libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(ICU_LINK) libadminutil.la | |
37 | libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION)) | |
38 | if CXXLINK_REQUIRED | |
39 | libadmsslutil_la_LINK = $(CXXLINK) | |
40 | --- adminutil-1.1.0/adminutil.pc.in.orig 2007-04-04 21:37:35.000000000 +0200 | |
41 | +++ adminutil-1.1.0/adminutil.pc.in 2007-06-16 11:00:35.900667997 +0200 | |
42 | @@ -6,6 +6,6 @@ | |
43 | Name: @PACKAGE_NAME@ | |
44 | Description: Utility library for directory server administration | |
45 | Version: @PACKAGE_VERSION@ | |
46 | -Requires: nspr, nss, svrcore, mozldap, icu | |
47 | +Requires: nspr, nss, mozldap, icu | |
48 | Libs: -ladmsslutil -ladminutil | |
49 | Cflags: -I${includedir}/admsslutil -I${includedir}/adminutil |