X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/blobdiff_plain/3f2ad2d41e9a9753d321427a7e1acae525767222..b92f8a0725abfd548aa6f569c298dd69c1b1b79c:/Makefile.in diff --git a/Makefile.in b/Makefile.in index a572d17..5033cfe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,9 +14,9 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.123 2007/10/07 02:50:45 mrsam Exp $ +# $Id: Makefile.am,v 1.134 2008/07/12 19:40:55 mrsam Exp $ # -# Copyright 1998 - 2007 Double Precision, Inc. See COPYING for +# Copyright 1998 - 2008 Double Precision, Inc. See COPYING for # distribution information. @@ -55,10 +55,10 @@ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ $(srcdir)/courier-authlib.lpspec.in \ $(srcdir)/courier-authlib.spec.in \ $(srcdir)/courier-authlib.sysvinit.in \ - $(srcdir)/courier_auth_config.h.in $(srcdir)/dbobj.h.in \ - $(srcdir)/userdb-test-cram-md5.pl.in $(top_srcdir)/configure \ - AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \ - depcomp install-sh ltmain.sh missing + $(srcdir)/courier_auth_config.h.in $(srcdir)/dbobj.config.in \ + $(srcdir)/dbobj.h.in $(srcdir)/userdb-test-cram-md5.pl.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -68,9 +68,9 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = courier_auth_config.h CONFIG_CLEAN_FILES = authdaemond authdaemonrc authsystem.passwd \ - README.authdebug.html dbobj.h authmigrate courier-authlib.spec \ - courier-authlib.lpspec courier-authlib.sysvinit \ - userdb-test-cram-md5.pl + README.authdebug.html dbobj.config dbobj.h authmigrate \ + courier-authlib.spec courier-authlib.lpspec \ + courier-authlib.sysvinit userdb-test-cram-md5.pl am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -88,6 +88,7 @@ libauthcustom_la_OBJECTS = $(am_libauthcustom_la_OBJECTS) libauthcustom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libauthcustom_la_LDFLAGS) $(LDFLAGS) -o $@ +am__DEPENDENCIES_1 = am_libauthldap_la_OBJECTS = authldap.lo preauthldap.lo authldaplib.lo libauthldap_la_OBJECTS = $(am_libauthldap_la_OBJECTS) libauthldap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -125,21 +126,16 @@ libauthshadow_la_OBJECTS = $(am_libauthshadow_la_OBJECTS) libauthshadow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libauthshadow_la_LDFLAGS) $(LDFLAGS) -o $@ -am__DEPENDENCIES_1 = userdb/libuserdb.la +am__DEPENDENCIES_2 = userdb/libuserdb.la am_libauthuserdb_la_OBJECTS = authuserdb.lo preauthuserdb.lo \ preauthuserdbcommon.lo authuserdbpwd.lo libauthuserdb_la_OBJECTS = $(am_libauthuserdb_la_OBJECTS) libauthuserdb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libauthuserdb_la_LDFLAGS) $(LDFLAGS) -o $@ -am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \ - preauthvchkpw.lo -libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS) -libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@ -libcourierauth_la_DEPENDENCIES = numlib/libnumlib.la \ - random128/librandom128.la rfc822/libencode.la +libcourierauth_la_DEPENDENCIES = libhmac/libhmac.la md5/libmd5.la \ + sha1/libsha1.la numlib/libnumlib.la random128/librandom128.la \ + rfc822/libencode.la am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ authoption.lo @@ -147,17 +143,10 @@ libcourierauth_la_OBJECTS = $(am_libcourierauth_la_OBJECTS) libcourierauth_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libcourierauth_la_LDFLAGS) $(LDFLAGS) -o $@ -am__libcourierauthcommon_la_SOURCES_DIST = auth.h courierauth.h \ - authpwdenumerate.c authsaslfrombase64.c authsasltobase64.c \ - authstaticlist.h authsyschangepwd.c authsyscommon.c cramlib.c \ - cramlib.h checkpassword.c cryptpassword.c checkpasswordmd5.c \ - checkpasswordsha1.c -@HAVE_MD5_TRUE@am__objects_1 = checkpasswordmd5.lo -@HAVE_SHA1_TRUE@am__objects_2 = checkpasswordsha1.lo am_libcourierauthcommon_la_OBJECTS = authpwdenumerate.lo \ authsaslfrombase64.lo authsasltobase64.lo authsyschangepwd.lo \ authsyscommon.lo cramlib.lo checkpassword.lo cryptpassword.lo \ - $(am__objects_1) $(am__objects_2) + checkpasswordmd5.lo checkpasswordsha1.lo libcourierauthcommon_la_OBJECTS = \ $(am_libcourierauthcommon_la_OBJECTS) libcourierauthcommon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -175,8 +164,8 @@ libcourierauthsaslclient_la_DEPENDENCIES = libcourierauth.la am_libcourierauthsaslclient_la_OBJECTS = authsaslclient.lo \ authsaslclientcram.lo authsaslclientcrammd5.lo \ authsaslclientcramsha1.lo authsaslclientlogin.lo \ - authsaslclientplain.lo authsaslfrombase64.lo \ - authsasltobase64.lo + authsaslclientplain.lo authsaslclientexternal.lo \ + authsaslfrombase64.lo authsasltobase64.lo libcourierauthsaslclient_la_OBJECTS = \ $(am_libcourierauthsaslclient_la_OBJECTS) libcourierauthsaslclient_la_LINK = $(LIBTOOL) --tag=CC \ @@ -188,7 +177,6 @@ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) am_authdaemondprog_OBJECTS = authdaemond.$(OBJEXT) authdaemondprog_OBJECTS = $(am_authdaemondprog_OBJECTS) -am__DEPENDENCIES_2 = authdaemondprog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(authdaemondprog_LDFLAGS) $(LDFLAGS) -o $@ @@ -233,8 +221,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \ $(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \ $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ - $(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \ - $(libcourierauth_la_SOURCES) \ + $(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ $(libcourierauthsaslclient_la_SOURCES) \ @@ -246,9 +233,8 @@ DIST_SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \ $(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \ $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ - $(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \ - $(libcourierauth_la_SOURCES) \ - $(am__libcourierauthcommon_la_SOURCES_DIST) \ + $(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \ + $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ $(libcourierauthsaslclient_la_SOURCES) \ $(authdaemondprog_SOURCES) $(authdaemontest_SOURCES) \ @@ -273,6 +259,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -304,7 +291,6 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DBSUBDIR = @DBSUBDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ @@ -317,7 +303,6 @@ EXPECT = @EXPECT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HMACLIB = @HMACLIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -334,12 +319,10 @@ LIBAUTHPIPE = @LIBAUTHPIPE@ LIBAUTHPWD = @LIBAUTHPWD@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ -LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ LIBLTDL = @LIBLTDL@ -LIBLTDL_SUBDIR = @LIBLTDL_SUBDIR@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -348,7 +331,6 @@ LN_S = @LN_S@ LTDLINCL = @LTDLINCL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MD5LIB = @MD5LIB@ MKDIR_P = @MKDIR_P@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LIBS = @MYSQL_LIBS@ @@ -368,14 +350,12 @@ PG_CONFIG = @PG_CONFIG@ RANLIB = @RANLIB@ REPOSITORY = @REPOSITORY@ SET_MAKE = @SET_MAKE@ -SHA1LIB = @SHA1LIB@ SHADOWLIBS = @SHADOWLIBS@ SHELL = @SHELL@ STRIP = @STRIP@ USE_DB = @USE_DB@ USE_GDBM = @USE_GDBM@ VERSION = @VERSION@ -VPOPMAILLIBS = @VPOPMAILLIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -438,15 +418,13 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ userdb = @userdb@ -vpopmail_home = @vpopmail_home@ AUTOMAKE_OPTIONS = dist-bzip2 -SUBDIRS = @LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog -DIST_SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog +SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog INCLUDES = $(LTDLINCL) modules = @LIBAUTHUSERDB@ \ @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ \ - @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@ + @LIBAUTHCUSTOM@ @LIBAUTHPIPE@ pkglibexecdir = $(libexecdir)/courier-authlib pkglibexec_SCRIPTS = authsystem.passwd @@ -457,14 +435,13 @@ pkglib_LTLIBRARIES = libcourierauth.la \ sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ libauthpam.la libauthpwd.la libauthshadow.la \ - libauthvchkpw.la \ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ libauthcustom.la \ libauthpipe.la -CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \ +CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h \ authpgsqlrc.h authpiperc.h authdaemon \ authlib.3 authlib.html packageversion.h \ authchangepwdir.h sbindir.h pkglibdir.h pkgincludedir.h \ @@ -473,7 +450,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \ DISTCLEANFILES = dbobj.config README_authlib.html commonlibdep = libcourierauthcommon.la -commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' +commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version commonlibadd = libcourierauthcommon.la libcourierauthcommon_t = @CRYPTLIBS@ libcourierauthcommon_la_SOURCES = \ @@ -484,20 +461,20 @@ libcourierauthcommon_la_SOURCES = \ authsyschangepwd.c authsyscommon.c \ cramlib.c cramlib.h \ checkpassword.c cryptpassword.c \ - $(checkpasswordmd5c) $(checkpasswordsha1c) + checkpasswordmd5.c checkpasswordsha1.c libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la libcourierauthcommon_la_LIBADD = libcourierauth.la -libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) +libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \ authmoduser2.c authmoduser3.c debug.c \ courierauthdebug.h \ authoption.c -libcourierauth_la_LIBADD = @HMACLIB@ @MD5LIB@ @SHA1LIB@ numlib/libnumlib.la \ +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@ +libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version # The userdb module libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@ @@ -512,8 +489,8 @@ libauthuserdb_la_LDFLAGS = $(commonldflags) libauthpam_t = -lpam @SHADOWLIBS@ @AUTHPAMCRYPT@ @LIBDL@ libauthpam_la_SOURCES = authpam.c preauthpam.c authwait.h libauthpam_la_DEPENDENCIES = $(commonlibdep) -libauthpam_la_LIBADD = $(commonlibadd) -libauthpam_la_LDFLAGS = $(commonldflags) $(libauthpam_t) +libauthpam_la_LIBADD = $(commonlibadd) $(libauthpam_t) +libauthpam_la_LDFLAGS = $(commonldflags) # The authpwd module libauthpwd_la_SOURCES = authpwd.c preauthpwd.c @@ -525,36 +502,29 @@ libauthpwd_la_LDFLAGS = $(commonldflags) libauthshadow_t = @SHADOWLIBS@ libauthshadow_la_SOURCES = authshadow.c preauthshadow.c libauthshadow_la_DEPENDENCIES = $(commonlibdep) -libauthshadow_la_LIBADD = $(commonlibadd) -libauthshadow_la_LDFLAGS = $(commonldflags) $(libauthshadow_t) - -# The authvchkpw module -libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@ -libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c -libauthvchkpw_la_DEPENDENCIES = $(commonlibdep) -libauthvchkpw_la_LIBADD = $(commonlibadd) -libauthvchkpw_la_LDFLAGS = $(commonldflags) $(libauthvchkpw_t) +libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) +libauthshadow_la_LDFLAGS = $(commonldflags) # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h libauthpgsql_la_DEPENDENCIES = $(commonlibdep) -libauthpgsql_la_LIBADD = $(commonlibadd) -libauthpgsql_la_LDFLAGS = $(commonldflags) $(libauthpgsql_t) +libauthpgsql_la_LIBADD = $(commonlibadd) $(libauthpgsql_t) +libauthpgsql_la_LDFLAGS = $(commonldflags) # The authldap module libauthldap_t = @LDAPLIBS@ @NETLIBS@ libauthldap_la_SOURCES = authldap.c preauthldap.c authldaplib.c authldap.h libauthldap_la_DEPENDENCIES = $(commonlibdep) -libauthldap_la_LIBADD = $(commonlibadd) -libauthldap_la_LDFLAGS = $(commonldflags) $(libauthldap_t) +libauthldap_la_LIBADD = $(commonlibadd) $(libauthldap_t) +libauthldap_la_LDFLAGS = $(commonldflags) # The authmysql module libauthmysql_t = @MYSQL_LIBS@ @LIBM@ @NETLIBS@ libauthmysql_la_SOURCES = authmysql.c preauthmysql.c authmysqllib.c authmysql.h libauthmysql_la_DEPENDENCIES = $(commonlibdep) -libauthmysql_la_LIBADD = $(commonlibadd) -libauthmysql_la_LDFLAGS = $(commonldflags) $(libauthmysql_t) +libauthmysql_la_LIBADD = $(commonlibadd) $(libauthmysql_t) +libauthmysql_la_LDFLAGS = $(commonldflags) # The authcustom module libauthcustom_la_SOURCES = authcustom.c preauthcustom.c authcustom.h @@ -567,16 +537,11 @@ libauthpipe_la_SOURCES = authpipe.c authpipelib.h authpipelib.c libauthpipe_la_DEPENDENCIES = $(commonlibdep) libauthpipe_la_LIBADD = $(commonlibadd) libauthpipe_la_LDFLAGS = $(commonldflags) -@HAVE_MD5_FALSE@checkpasswordmd5c = -@HAVE_MD5_TRUE@checkpasswordmd5c = checkpasswordmd5.c -@HAVE_SHA1_FALSE@checkpasswordsha1c = -@HAVE_SHA1_TRUE@checkpasswordsha1c = checkpasswordsha1.c HTMLFILES = README.html NEWS.html INSTALL.html \ README.authmysql.html README.authpostgres.html EXTRA_DIST = $(HTMLFILES) sysconftool COPYING COPYING.GPL\ authldap.schema \ - checkpasswordmd5.c checkpasswordsha1.c \ authldaprc authmysqlrc authpgsqlrc README.ldap \ README.authmysql.myownquery \ README.authdebug.html.in \ @@ -601,15 +566,16 @@ libcourierauthsasl_la_SOURCES = \ authsaslfrombase64.c authsasltobase64.c libcourierauthsasl_la_LIBADD = libcourierauth.la -libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl$$' +libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \ authsaslclient.c authsaslclient.h authsaslclientcram.c \ authsaslclientcrammd5.c authsaslclientcramsha1.c \ authsaslclientlogin.c authsaslclientplain.c \ + authsaslclientexternal.c \ authsaslfrombase64.c authsasltobase64.c libcourierauthsaslclient_la_LIBADD = libcourierauth.la -libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' +libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ courierauthsaslclient.h courierauthdebug.h @@ -655,7 +621,7 @@ man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ man1 = authpasswd.1 authtest.1 man_MANS = $(man1) $(man3) BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ - authdaemonrc.h vpopmail_config.h packageversion.h \ + authdaemonrc.h packageversion.h \ authchangepwdir.h sbindir.h \ pkglibdir.h pkgincludedir.h mailusergroup.h \ README_authlib.html @@ -728,6 +694,8 @@ authsystem.passwd: $(top_builddir)/config.status $(srcdir)/authsystem.passwd.in cd $(top_builddir) && $(SHELL) ./config.status $@ README.authdebug.html: $(top_builddir)/config.status $(srcdir)/README.authdebug.html.in cd $(top_builddir) && $(SHELL) ./config.status $@ +dbobj.config: $(top_builddir)/config.status $(srcdir)/dbobj.config.in + cd $(top_builddir) && $(SHELL) ./config.status $@ dbobj.h: $(top_builddir)/config.status $(srcdir)/dbobj.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ authmigrate: $(top_builddir)/config.status $(srcdir)/authmigrate.in @@ -746,8 +714,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ else :; fi; \ done @@ -755,8 +723,8 @@ uninstall-pkglibLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ done clean-pkglibLTLIBRARIES: @@ -785,8 +753,6 @@ libauthshadow.la: $(libauthshadow_la_OBJECTS) $(libauthshadow_la_DEPENDENCIES) $(libauthshadow_la_LINK) $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS) libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS) -libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) - $(libauthvchkpw_la_LINK) $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS) libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) @@ -804,8 +770,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -839,8 +805,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -952,6 +918,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientcram.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientcrammd5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientcramsha1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientexternal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientlogin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientplain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslcram.Plo@am__quote@ @@ -965,8 +932,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@ @@ -983,7 +948,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1197,8 +1161,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1223,8 +1187,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) courier_auth_config.h.in $(TAGS_DEPEN unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1234,13 +1198,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) courier_auth_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) courier_auth_config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1313,6 +1276,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -1340,6 +1307,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -1520,7 +1489,7 @@ uninstall-man: uninstall-man1 uninstall-man3 clean-generic clean-libtool clean-noinstPROGRAMS \ clean-pkglibLTLIBRARIES clean-sbinPROGRAMS ctags \ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -1542,12 +1511,6 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS -authvchkpw.lo: authvchkpw.c vpopmail_config.h -preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h - -vpopmail_config.h: - echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h - authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc: @@ -1683,8 +1646,6 @@ install-exec-hook: test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \ $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ - $(INSTALL_SCRIPT) userdb/vchkpw2userdb \ - $(DESTDIR)$(sbindir)/vchkpw2userdb ; \ $(INSTALL_SCRIPT) userdb/pw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb ; \ $(INSTALL_SCRIPT) userdb/makeuserdb \ @@ -1695,17 +1656,18 @@ 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 test "@AUTHUSERDB@" = "" && exit 0 ;\ rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \ - $(DESTDIR)$(sbindir)/vchkpw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb \ $(DESTDIR)$(sbindir)/makeuserdb \ $(DESTDIR)$(sbindir)/userdb \ $(DESTDIR)$(sbindir)/userdbpw \ $(DESTDIR)$(sbindir)/userdb-test-cram-md5 + for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0; done authlib.html: authlib.html.in CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status @@ -1870,18 +1832,17 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec mv @PACKAGE@.lpspec.new @PACKAGE@.lpspec upload-beta: + test -z "$(SFPASSWD)" && exit 1; exit 0 rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1 socksify ssh grace.speakeasy.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>courier-mta.org/@PACKAGE@.beta - ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@-dev && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf ' - scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@-dev/@PACKAGE@-@VERSION@ + rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/ + ../sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` "" "" @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig upload-dist: rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1 socksify cvs tag -F -r @PACKAGE@-latest \ `echo @PACKAGE@-@VERSION@ | tr '.' '-'` - socksify perl -e 'use Net::FTP; $$ftp=Net::FTP->new("upload.sourceforge.net.", Debug => 1, Passive => 1 ) || die; $$ftp->login("anonymous", "anonymous") || die; $$ftp->cwd("/incoming") && $$ftp->binary() && $$ftp->hash(1) && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2") && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2.sig") && exit 0; die;' - ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@ && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf ' - scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@/@PACKAGE@-@VERSION@ + rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/ release-dist: test -z "$(SFPASSWD)" && exit 1; exit 0