1 $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
3 --- Makefile.in.orig 2009-02-03 23:39:56.000000000 +0000
5 @@ -511,7 +511,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h
7 DISTCLEANFILES = dbobj.config README_authlib.html
8 commonlibdep = libcourierauthcommon.la
9 -commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
10 +commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
11 commonlibadd = libcourierauthcommon.la
12 libcourierauthcommon_t = @CRYPTLIBS@
13 libcourierauthcommon_la_SOURCES = \
14 @@ -527,7 +527,7 @@ libcourierauthcommon_la_SOURCES = \
16 libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
17 libcourierauthcommon_la_LIBADD = libcourierauth.la
18 -libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
19 +libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
20 libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
21 authmoduser2.c authmoduser3.c debug.c \
23 @@ -536,7 +536,7 @@ libcourierauth_la_SOURCES = authdaemon.c
24 libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
25 random128/librandom128.la rfc822/libencode.la
27 -libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
28 +libcourierauth_la_LDFLAGS = @NETLIBS@
31 libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
32 @@ -629,7 +629,7 @@ libcourierauthsasl_la_SOURCES = \
33 authsaslfrombase64.c authsasltobase64.c
35 libcourierauthsasl_la_LIBADD = libcourierauth.la
36 -libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
37 +libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$'
38 libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
39 authsaslclient.c authsaslclient.h authsaslclientcram.c \
40 authsaslclientcrammd5.c authsaslclientcramsha1.c \
41 @@ -638,7 +638,7 @@ libcourierauthsaslclient_la_SOURCES = co
42 authsaslfrombase64.c authsasltobase64.c
44 libcourierauthsaslclient_la_LIBADD = libcourierauth.la
45 -libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
46 +libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
47 include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
48 courierauthsaslclient.h courierauthdebug.h
50 @@ -669,9 +669,9 @@ authdaemondprog_DEPENDENCIES = libcourie
52 authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
53 libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
54 - rfc822/libencode.la numlib/libnumlib.la
55 + rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS)
57 -authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
58 +authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
59 authdaemontest_SOURCES = authdaemontest.c
60 authdaemontest_DEPENDENCIES = libcourierauthcommon.la
61 authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
62 @@ -1689,14 +1689,14 @@ uninstall-man: uninstall-man1 uninstall-
63 authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
65 @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
66 -@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
67 +@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
68 @HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
69 -@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist
70 -@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
71 -@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
72 +@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)$(authpgsqlrc).dist
73 +@HAVE_AUTHPGSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
74 +@HAVE_AUTHPGSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
76 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
77 -@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist
78 +@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)$(authpgsqlrc).dist
80 @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
81 @HAVE_AUTHPGSQL_FALSE@ @:
82 @@ -1705,19 +1705,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
83 @HAVE_AUTHPGSQL_FALSE@ @:
86 - echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
87 + echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
89 authldaplib.lo: authldaplib.c authldaprc.h
91 @HAVE_LDAP_TRUE@install-authldaprc:
92 -@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
93 +@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
94 @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
95 -@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist
96 -@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist
97 -@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
98 +@HAVE_LDAP_TRUE@ $(DESTDIR)$(authldaprc).dist
99 +@HAVE_LDAP_TRUE@ -chown $(mailuser) $(DESTDIR)$(authldaprc).dist
100 +@HAVE_LDAP_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
102 @HAVE_LDAP_TRUE@uninstall-authldaprc:
103 -@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist
104 +@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)$(authldaprc).dist
106 @HAVE_LDAP_FALSE@install-authldaprc:
108 @@ -1726,19 +1726,19 @@ authldaplib.lo: authldaplib.c authldaprc
112 - echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
113 + echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
115 authmysqllib.lo: authmysqllib.c authmysqlrc.h
117 @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
118 -@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
119 +@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
120 @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
121 -@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist
122 -@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
123 -@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
124 +@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)$(authmysqlrc).dist
125 +@HAVE_AUTHMYSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
126 +@HAVE_AUTHMYSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
128 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
129 -@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist
130 +@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)$(authmysqlrc).dist
132 @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
133 @HAVE_AUTHMYSQL_FALSE@ @:
134 @@ -1747,27 +1747,27 @@ authmysqllib.lo: authmysqllib.c authmysq
135 @HAVE_AUTHMYSQL_FALSE@ @:
138 - echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
139 + echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
141 authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
144 - echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
145 + echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
147 install-authdaemonrc:
148 - $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
149 + $(mkinstalldirs) $(DESTDIR)`dirname $(authdaemonrc)` || :
150 sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
151 - $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
152 + $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
153 rm -f authdaemonrc.tmp
154 - -chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
155 - -chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
156 + -chown $(mailuser) $(DESTDIR)$(authdaemonrc).dist
157 + -chgrp $(mailgroup) $(DESTDIR)$(authdaemonrc).dist
159 uninstall-authdaemonrc:
160 - rm -f $(DESTDIR)@authdaemonrc@.dist
161 + rm -f $(DESTDIR)$(authdaemonrc).dist
164 - echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
165 - echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
166 + echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
167 + echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
168 echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
169 echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
170 echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
171 @@ -1785,20 +1785,20 @@ authchangepwdir.h: config.status
172 echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
174 sbindir.h: config.status
175 - echo '#define SBINDIR "@sbindir@"' >sbindir.h
176 + echo '#define SBINDIR "$(sbindir)"' >sbindir.h
178 pkglibdir.h: config.status
179 echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
181 packageversion.h: config.status
182 - echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
183 + echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
185 pkgincludedir.h: config.status
186 echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
188 mailusergroup.h: config.status
189 - echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
190 - echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
191 + echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
192 + echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
195 for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
196 @@ -1814,10 +1814,10 @@ install-exec-hook:
197 $(mkinstalldirs) $(DESTDIR)$(sbindir) || :
198 $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
199 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
200 - $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
201 - chmod 750 $(DESTDIR)@authdaemonvar@
202 - -chown @mailuser@ $(DESTDIR)@authdaemonvar@
203 - -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
204 + $(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
205 + chmod 750 $(DESTDIR)$(authdaemonvar)
206 + -chown $(mailuser) $(DESTDIR)$(authdaemonvar)
207 + -chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
208 test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
209 $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
210 $(DESTDIR)$(pkglibexecdir)/makedatprog ; \
211 @@ -1831,7 +1831,6 @@ install-exec-hook:
212 $(DESTDIR)$(sbindir)/userdbpw ; \
213 $(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
214 $(DESTDIR)$(sbindir)/userdb-test-cram-md5
215 - for f in $(pkglib_LTLIBRARIES); do . ./$$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
217 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
218 rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
219 @@ -1930,13 +1930,13 @@ README_authlib.html: README_authlib.html
220 authdaemond.o: authdaemonrc.h authdaemond.c
222 install-migrate: authmigrate
223 - @SHELL@ authmigrate
224 + $(SHELL) authmigrate
227 - test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
228 - test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
229 - test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
230 - test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
231 + test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
232 + test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
233 + test -f $(DESTDIR)$(authpgsqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authpgsqlrc).dist || true
234 + test -f $(DESTDIR)$(authldaprc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authldaprc).dist || true
236 # For maintainer's use only