$NetBSD: patch-aa,v 1.9 2012/06/09 11:57:20 adam Exp $

--- Makefile.in.orig	2012-04-28 13:21:54.000000000 +0000
+++ Makefile.in
@@ -516,7 +516,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
 
 DISTCLEANFILES = dbobj.config README_authlib.html
 commonlibdep = libcourierauthcommon.la
-commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
+commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
 commonlibadd = libcourierauthcommon.la
 libcourierauthcommon_t = @CRYPTLIBS@
 libcourierauthcommon_la_SOURCES = \
@@ -532,7 +532,7 @@ libcourierauthcommon_la_SOURCES = \
 
 libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
 libcourierauthcommon_la_LIBADD = libcourierauth.la
-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
 libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
 	authmoduser2.c authmoduser3.c debug.c \
 	courierauthdebug.h \
@@ -541,7 +541,7 @@ libcourierauth_la_SOURCES = authdaemon.c
 libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
 	random128/librandom128.la rfc822/libencode.la
 
-libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
+libcourierauth_la_LDFLAGS = @NETLIBS@
 
 # The userdb module
 libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
@@ -634,7 +634,7 @@ libcourierauthsasl_la_SOURCES = \
 	authsaslfrombase64.c authsasltobase64.c
 
 libcourierauthsasl_la_LIBADD = libcourierauth.la
-libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
+libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$'
 libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
 	authsaslclient.c authsaslclient.h authsaslclientcram.c \
 	authsaslclientcrammd5.c authsaslclientcramsha1.c \
@@ -643,7 +643,7 @@ libcourierauthsaslclient_la_SOURCES = co
 	authsaslfrombase64.c authsasltobase64.c
 
 libcourierauthsaslclient_la_LIBADD = libcourierauth.la
-libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
+libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
 include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
 	courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
 
@@ -674,9 +674,9 @@ authdaemondprog_DEPENDENCIES = libcourie
 
 authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
 	libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
-	rfc822/libencode.la numlib/libnumlib.la
+	rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS)
 
-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
 authdaemontest_SOURCES = authdaemontest.c
 authdaemontest_DEPENDENCIES = libcourierauthcommon.la
 authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
@@ -1697,14 +1697,14 @@ uninstall-man: uninstall-man1 uninstall-
 authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
 
 @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
-@HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
+@HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
 @HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
-@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.dist
-@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
-@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
+@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)$(authpgsqlrc).dist
+@HAVE_AUTHPGSQL_TRUE@	-chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
+@HAVE_AUTHPGSQL_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
 
 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
-@HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
+@HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)$(authpgsqlrc).dist
 
 @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
 @HAVE_AUTHPGSQL_FALSE@	@:
@@ -1713,19 +1713,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
 @HAVE_AUTHPGSQL_FALSE@	@:
 
 authpgsqlrc.h:
-	echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
+	echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
 
 authldaplib.lo: authldaplib.c authldaprc.h
 
 @HAVE_LDAP_TRUE@install-authldaprc:
-@HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
+@HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
 @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
-@HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist
-@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist
-@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
+@HAVE_LDAP_TRUE@		$(DESTDIR)$(authldaprc).dist
+@HAVE_LDAP_TRUE@	-chown $(mailuser) $(DESTDIR)$(authldaprc).dist
+@HAVE_LDAP_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
 
 @HAVE_LDAP_TRUE@uninstall-authldaprc:
-@HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
+@HAVE_LDAP_TRUE@	rm -f $(DESTDIR)$(authldaprc).dist
 
 @HAVE_LDAP_FALSE@install-authldaprc:
 @HAVE_LDAP_FALSE@	@:
@@ -1734,19 +1734,19 @@ authldaplib.lo: authldaplib.c authldaprc
 @HAVE_LDAP_FALSE@	@:
 
 authldaprc.h:
-	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
+	echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
 
 authmysqllib.lo: authmysqllib.c authmysqlrc.h
 
 @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
-@HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
+@HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
 @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
-@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist
-@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
-@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
+@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)$(authmysqlrc).dist
+@HAVE_AUTHMYSQL_TRUE@	-chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
+@HAVE_AUTHMYSQL_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
 
 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
-@HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
+@HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)$(authmysqlrc).dist
 
 @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
 @HAVE_AUTHMYSQL_FALSE@	@:
@@ -1755,27 +1755,27 @@ authmysqllib.lo: authmysqllib.c authmysq
 @HAVE_AUTHMYSQL_FALSE@	@:
 
 authmysqlrc.h:
-	echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
+	echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
 
 authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
 
 authpiperc.h:
-	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
+	echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
 
 install-authdaemonrc:
-	$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
+	$(mkinstalldirs) $(DESTDIR)`dirname $(authdaemonrc)` || :
 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
-	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
+	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
 	rm -f authdaemonrc.tmp
-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
+	-chown $(mailuser) $(DESTDIR)$(authdaemonrc).dist
+	-chgrp $(mailgroup) $(DESTDIR)$(authdaemonrc).dist
 
 uninstall-authdaemonrc:
-	rm -f $(DESTDIR)@authdaemonrc@.dist
+	rm -f $(DESTDIR)$(authdaemonrc).dist
 
 authdaemonrc.h:
-	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
-	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
+	echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
+	echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
 	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
 	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
@@ -1793,20 +1793,20 @@ authchangepwdir.h: config.status
 	echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
 
 sbindir.h: config.status
-	echo '#define SBINDIR "@sbindir@"' >sbindir.h
+	echo '#define SBINDIR "$(sbindir)"' >sbindir.h
 
 pkglibdir.h: config.status
 	echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
 
 packageversion.h: config.status
-	echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
+	echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
 
 pkgincludedir.h: config.status
 	echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
 
 mailusergroup.h: config.status
-	echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
-	echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
+	echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
+	echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
 
 dist-hook:
 	for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
@@ -1822,10 +1822,10 @@ install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
-	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
-	chmod 750 $(DESTDIR)@authdaemonvar@
-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
+	$(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
+	chmod 750 $(DESTDIR)$(authdaemonvar)
+	-chown $(mailuser) $(DESTDIR)$(authdaemonvar)
+	-chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
@@ -1839,7 +1839,6 @@ install-exec-hook:
 				$(DESTDIR)$(sbindir)/userdbpw ; \
 		$(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
 				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
-	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
 
 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
 	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
@@ -1938,13 +1937,13 @@ README_authlib.html: README_authlib.html
 authdaemond.o: authdaemonrc.h authdaemond.c
 
 install-migrate: authmigrate
-	@SHELL@ authmigrate
+	$(SHELL) authmigrate
 
 install-configure:
-	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
-	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
-	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
-	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
+	test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
+	test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
+	test -f $(DESTDIR)$(authpgsqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authpgsqlrc).dist || true
+	test -f $(DESTDIR)$(authldaprc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authldaprc).dist || true
 
 # For maintainer's use only