]>
Commit | Line | Data |
---|---|---|
da55fa6c JB |
1 | --- adminutil-1.1.0/Makefile.am.orig 2007-06-16 10:42:14.617909469 +0200 |
2 | +++ adminutil-1.1.0/Makefile.am 2007-06-16 10:50:24.605832289 +0200 | |
3 | @@ -16,7 +16,8 @@ | |
4 | #------------------------ | |
5 | NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4 | |
6 | NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3 | |
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 | SASL_LINK = @sasl_lib@ -lsasl2 | |
11 | ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata | |
12 | ||
13 | @@ -30,7 +31,7 @@ | |
14 | TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite | |
15 | ||
16 | TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @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 | @@ -108,7 +109,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 | ||
29 | #------------------------ | |
30 | # libadmsslutil | |
31 | @@ -122,4 +123,4 @@ | |
32 | lib/libadmsslutil/uginfossl.c | |
33 | ||
34 | libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@ | |
35 | -libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) | |
36 | +libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(ICU_LINK) $(top_builddir)/libadminutil.la | |
37 | --- adminutil-1.1.0/configure.ac.orig 2007-04-04 21:37:36.000000000 +0200 | |
38 | +++ adminutil-1.1.0/configure.ac 2007-06-16 10:50:40.698749373 +0200 | |
39 | @@ -87,7 +87,6 @@ | |
40 | m4_include(m4/nspr.m4) | |
41 | m4_include(m4/nss.m4) | |
42 | m4_include(m4/mozldap.m4) | |
43 | -m4_include(m4/sasl.m4) | |
44 | m4_include(m4/icu.m4) | |
45 | m4_include(m4/fhs.m4) | |
46 | ||
47 | @@ -114,8 +113,6 @@ | |
48 | AC_SUBST(ldapsdk_inc) | |
49 | AC_SUBST(ldapsdk_lib) | |
50 | AC_SUBST(ldapsdk_libdir) | |
51 | -AC_SUBST(sasl_inc) | |
52 | -AC_SUBST(sasl_lib) | |
53 | AC_SUBST(icu_inc) | |
54 | AC_SUBST(icu_lib) | |
55 | AC_SUBST(icu_libdir) | |
56 | --- adminutil-1.1.0/adminutil.pc.in.orig 2007-04-04 21:37:35.000000000 +0200 | |
57 | +++ adminutil-1.1.0/adminutil.pc.in 2007-06-16 11:00:35.900667997 +0200 | |
58 | @@ -6,6 +6,6 @@ | |
59 | Name: @PACKAGE_NAME@ | |
60 | Description: Utility library for directory server administration | |
61 | Version: @PACKAGE_VERSION@ | |
62 | -Requires: nspr, nss, svrcore, mozldap, icu | |
63 | +Requires: nspr, nss, mozldap, icu | |
64 | Libs: -ladmsslutil -ladminutil | |
65 | Cflags: -I${includedir}/admsslutil -I${includedir}/adminutil |