Changeset View
Changeset View
Standalone View
Standalone View
head/security/courier-authlib/files/patch-Makefile.in
| --- Makefile.in.orig 2017-07-02 14:41:39 UTC | --- Makefile.in.orig 2018-09-13 23:11:36 UTC | ||||
| +++ Makefile.in | +++ Makefile.in | ||||
| @@ -95,11 +95,10 @@ PRE_UNINSTALL = : | @@ -95,11 +95,10 @@ PRE_UNINSTALL = : | ||||
| POST_UNINSTALL = : | POST_UNINSTALL = : | ||||
| build_triplet = @build@ | build_triplet = @build@ | ||||
| host_triplet = @host@ | host_triplet = @host@ | ||||
| -sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) \ | -sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) \ | ||||
| - authpasswd$(EXEEXT) | - authpasswd$(EXEEXT) | ||||
| -bin_PROGRAMS = courierauthconfig$(EXEEXT) | -bin_PROGRAMS = courierauthconfig$(EXEEXT) | ||||
| -noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ | -noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ | ||||
| - authdaemondprog$(EXEEXT) | - authdaemondprog$(EXEEXT) | ||||
| +@HAVE_BASE_TRUE@sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) | +@HAVE_BASE_TRUE@sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) | ||||
| +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT) | +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT) | ||||
| +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ | +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ | ||||
| +@HAVE_BASE_TRUE@ authdaemondprog$(EXEEXT) | +@HAVE_BASE_TRUE@ authdaemondprog$(EXEEXT) | ||||
| subdir = . | subdir = . | ||||
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||||
| am__aclocal_m4_deps = $(top_srcdir)/configure.ac | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | ||||
| @@ -219,6 +218,13 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac. | @@ -219,6 +218,12 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac. | ||||
| libs/md5/libmd5.la libs/sha1/libsha1.la \ | libs/md5/libmd5.la libs/sha1/libsha1.la \ | ||||
| libs/numlib/libnumlib.la libs/random128/librandom128.la \ | libs/numlib/libnumlib.la libs/random128/librandom128.la \ | ||||
| libs/rfc822/libencode.la | libs/rfc822/libencode.la | ||||
| +am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \ | +am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \ | ||||
| + preauthvchkpw.lo | + preauthvchkpw.lo | ||||
| +libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS) | +libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS) | ||||
| +libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | +libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||||
| + $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@ | + $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| + | |||||
| am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ | am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ | ||||
| preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ | preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ | ||||
| authoption.lo | authoption.lo | ||||
| @@ -350,6 +356,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la | @@ -350,6 +355,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la | ||||
| $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ | $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ | ||||
| $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ | $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ | ||||
| $(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \ | $(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \ | ||||
| + $(libauthvchkpw_la_SOURCES) \ | + $(libauthvchkpw_la_SOURCES) \ | ||||
| $(libcourierauth_la_SOURCES) \ | $(libcourierauth_la_SOURCES) \ | ||||
| $(libcourierauthcommon_la_SOURCES) \ | $(libcourierauthcommon_la_SOURCES) \ | ||||
| $(libcourierauthsasl_la_SOURCES) \ | $(libcourierauthsasl_la_SOURCES) \ | ||||
| @@ -532,6 +539,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ | @@ -532,6 +538,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ | ||||
| LIBAUTHSHADOW = @LIBAUTHSHADOW@ | LIBAUTHSHADOW = @LIBAUTHSHADOW@ | ||||
| LIBAUTHSQLITE = @LIBAUTHSQLITE@ | LIBAUTHSQLITE = @LIBAUTHSQLITE@ | ||||
| LIBAUTHUSERDB = @LIBAUTHUSERDB@ | LIBAUTHUSERDB = @LIBAUTHUSERDB@ | ||||
| +LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ | +LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ | ||||
| LIBDB = @LIBDB@ | LIBDB = @LIBDB@ | ||||
| LIBDL = @LIBDL@ | LIBDL = @LIBDL@ | ||||
| LIBGDBM = @LIBGDBM@ | LIBGDBM = @LIBGDBM@ | ||||
| @@ -657,21 +665,27 @@ top_builddir = @top_builddir@ | @@ -657,21 +664,26 @@ top_builddir = @top_builddir@ | ||||
| top_srcdir = @top_srcdir@ | top_srcdir = @top_srcdir@ | ||||
| userdb = @userdb@ | userdb = @userdb@ | ||||
| AUTOMAKE_OPTIONS = dist-bzip2 | AUTOMAKE_OPTIONS = dist-bzip2 | ||||
| -SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/random128 libs/liblock liblog | -SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/random128 libs/liblock liblog | ||||
| +SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib | +SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib | ||||
| +@HAVE_USERDB_TRUE@SUBDIRS+= libs/makedat userdb | +@HAVE_USERDB_TRUE@SUBDIRS += libs/makedat userdb | ||||
| +SUBDIRS += libs/rfc822 libs/random128 | +SUBDIRS += libs/rfc822 libs/random128 | ||||
| +@HAVE_BASE_TRUE@SUBDIRS+= libs/liblock liblog | +@HAVE_BASE_TRUE@ SUBDIRS += libs/liblock liblog | ||||
| AM_CPPFLAGS = -I liblock $(LTDLINCL) | AM_CPPFLAGS = -I liblock $(LTDLINCL) | ||||
| modules = @LIBAUTHUSERDB@ \ | modules = @LIBAUTHUSERDB@ \ | ||||
| @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ | @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ | ||||
| @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \ | @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \ | ||||
| - @LIBAUTHCUSTOM@ @LIBAUTHPIPE@ | - @LIBAUTHCUSTOM@ @LIBAUTHPIPE@ | ||||
| + @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@ | + @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@ | ||||
| pkglibexec_SCRIPTS = authsystem.passwd | pkglibexec_SCRIPTS = authsystem.passwd | ||||
| -pkglib_LTLIBRARIES = libcourierauth.la \ | -pkglib_LTLIBRARIES = libcourierauth.la \ | ||||
| - libcourierauthsasl.la libcourierauthsaslclient.la \ | - libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \ | ||||
| - libcourierauthcommon.la $(modules) | - $(modules) | ||||
| +@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \ | +@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \ | ||||
| +@HAVE_BASE_TRUE@ libcourierauthsasl.la libcourierauthsaslclient.la \ | +@HAVE_BASE_TRUE@ libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \ | ||||
| +@HAVE_BASE_TRUE@ libcourierauthcommon.la $(modules) | +@HAVE_BASE_TRUE@ $(modules) | ||||
| +@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) | +@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) | ||||
| + | |||||
| sbin_SCRIPTS = authdaemond | sbin_SCRIPTS = authdaemond | ||||
| EXTRA_LTLIBRARIES = libauthuserdb.la \ | EXTRA_LTLIBRARIES = libauthuserdb.la \ | ||||
| libauthpam.la libauthpwd.la libauthshadow.la \ | libauthpam.la libauthpwd.la libauthshadow.la \ | ||||
| + libauthvchkpw.la \ | + libauthvchkpw.la \ | ||||
| libauthpgsql.la \ | libauthpgsql.la \ | ||||
| libauthldap.la \ | libauthldap.la \ | ||||
| libauthmysql.la \ | libauthmysql.la \ | ||||
| @@ -746,6 +760,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep) | @@ -746,6 +758,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep) | ||||
| libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) | libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) | ||||
| libauthshadow_la_LDFLAGS = $(commonldflags) | libauthshadow_la_LDFLAGS = $(commonldflags) | ||||
| +# The authvchkpw module | +# The authvchkpw module | ||||
| +libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@ | +libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@ | ||||
| +libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c | +libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c | ||||
| +libauthvchkpw_la_DEPENDENCIES = $(commonlibdep) | +libauthvchkpw_la_DEPENDENCIES = $(commonlibdep) | ||||
| +libauthvchkpw_la_LIBADD = $(commonlibadd) | +libauthvchkpw_la_LIBADD = $(commonlibadd) $(libauthvchkpw_t) | ||||
| +libauthvchkpw_la_LDFLAGS = $(commonldflags) $(libauthvchkpw_t) | +libauthvchkpw_la_LDFLAGS = $(commonldflags) | ||||
| + | + | ||||
| # The authpgsql module | # The authpgsql module | ||||
| libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ | libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ | ||||
| libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h | libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h | ||||
| @@ -827,8 +848,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc | @@ -827,8 +846,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc | ||||
| libcourierauthsaslclient_la_LIBADD = libcourierauth.la | 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$$' -avoid-version | ||||
| -include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ | -include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ | ||||
| - courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h | - courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h | ||||
| +@HAVE_BASE_TRUE@include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ | +@HAVE_BASE_TRUE@include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ | ||||
| +@HAVE_BASE_TRUE@ courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h | +@HAVE_BASE_TRUE@ courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h | ||||
| courierauthconfig_SOURCES = authinfo.c | courierauthconfig_SOURCES = authinfo.c | ||||
| authpasswd_SOURCES = authpasswd.c | authpasswd_SOURCES = authpasswd.c | ||||
| @@ -869,7 +890,7 @@ authmksock_LDADD = @NETLIBS@ | @@ -870,7 +889,7 @@ authmksock_LDADD = @NETLIBS@ | ||||
| man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 auth_mkhomedir.3 \ | man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 auth_mkhomedir.3 \ | ||||
| auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3 | auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3 | ||||
| -man1 = authpasswd.1 authtest.1 | -man1 = authpasswd.1 authtest.1 | ||||
| +man1 = authtest.1 | +man1 = authtest.1 | ||||
| man_MANS = $(man1) $(man3) auth_sasl_ex.3 | man_MANS = $(man1) $(man3) auth_sasl_ex.3 | ||||
| BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ | BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ | ||||
| authdaemonrc.h packageversion.h \ | authdaemonrc.h packageversion.h \ | ||||
| @@ -1027,6 +1048,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut | @@ -1028,6 +1047,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut | ||||
| libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) | libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) | ||||
| $(AM_V_CCLD)$(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS) | $(AM_V_CCLD)$(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS) | ||||
| +libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) | +libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) | ||||
| + $(AM_V_CCLD)$(libauthvchkpw_la_LINK) $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS) | + $(AM_V_CCLD)$(libauthvchkpw_la_LINK) $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS) | ||||
| + | + | ||||
| libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) | libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) | ||||
| $(AM_V_CCLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) | $(AM_V_CCLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) | ||||
| @@ -1297,6 +1321,8 @@ distclean-compile: | @@ -1298,6 +1320,8 @@ distclean-compile: | ||||
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@ | @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)/authuserdb.Plo@am__quote@ | ||||
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.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)/authvchkpw.Plo@am__quote@ | ||||
| +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.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)/checkpassword.Plo@am__quote@ | ||||
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.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@ | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@ | ||||
| @@ -1312,6 +1338,7 @@ distclean-compile: | @@ -1313,6 +1337,7 @@ distclean-compile: | ||||
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ | @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)/preauthuserdb.Plo@am__quote@ | ||||
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.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@ | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@ | ||||
| .c.o: | .c.o: | ||||
| @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||||
| @@ -1836,18 +1863,26 @@ info: info-recursive | @@ -1837,18 +1862,26 @@ info: info-recursive | ||||
| info-am: | info-am: | ||||
| -install-data-am: install-includeHEADERS install-man | -install-data-am: install-includeHEADERS install-man | ||||
| - @$(NORMAL_INSTALL) | - @$(NORMAL_INSTALL) | ||||
| - $(MAKE) $(AM_MAKEFLAGS) install-data-hook | - $(MAKE) $(AM_MAKEFLAGS) install-data-hook | ||||
| +@HAVE_BASE_TRUE@install-data-am: install-includeHEADERS install-man | +@HAVE_BASE_TRUE@install-data-am: install-includeHEADERS install-man | ||||
| +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) | +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) | ||||
| +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook | +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook | ||||
| + | + | ||||
| +@HAVE_BASE_FALSE@install-data-am: | +@HAVE_BASE_FALSE@install-data-am: | ||||
| +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook | +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook | ||||
| + | + | ||||
| +@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ | |||||
| +@HAVE_BASE_TRUE@ install-pkglibexecSCRIPTS install-sbinPROGRAMS \ | |||||
| +@HAVE_BASE_TRUE@ install-sbinSCRIPTS | |||||
| +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) | |||||
| +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook | |||||
| + | |||||
| +@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES | |||||
| +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook | |||||
| + | |||||
| install-dvi: install-dvi-recursive | install-dvi: install-dvi-recursive | ||||
| install-dvi-am: | install-dvi-am: | ||||
| -install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ | -install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ | ||||
| - install-pkglibexecSCRIPTS install-sbinPROGRAMS \ | - install-pkglibexecSCRIPTS install-sbinPROGRAMS \ | ||||
| - install-sbinSCRIPTS | - install-sbinSCRIPTS | ||||
| - @$(NORMAL_INSTALL) | - @$(NORMAL_INSTALL) | ||||
| - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook | - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook | ||||
| +@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ | |||||
| +@HAVE_BASE_TRUE@ install-pkglibexecSCRIPTS install-sbinPROGRAMS \ | |||||
| +@HAVE_BASE_TRUE@ install-sbinSCRIPTS | |||||
| +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) | |||||
| +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook | |||||
| + | |||||
| +@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES | |||||
| +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook | |||||
| + | |||||
| install-html: install-html-recursive | install-html: install-html-recursive | ||||
| install-html-am: | install-html-am: | ||||
| @@ -1929,12 +1964,16 @@ uninstall-man: uninstall-man1 uninstall-man3 | @@ -1929,13 +1962,16 @@ uninstall-man: uninstall-man1 uninstall-man3 | ||||
| .PRECIOUS: Makefile | .PRECIOUS: Makefile | ||||
| +authvchkpw.lo: authvchkpw.c vpopmail_config.h | +authvchkpw.lo: authvchkpw.c vpopmail_config.h | ||||
| +preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h | +preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h | ||||
| + | |||||
| +vpopmail_config.h: | +vpopmail_config.h: | ||||
| + echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h | + echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h | ||||
| + | + | ||||
| @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc: | @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@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \ | ||||
| @HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist | @HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist | ||||
| -@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist | -@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist | ||||
| -@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist | -@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist | ||||
| @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: | @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: | ||||
| @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist | @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist | ||||
| @@ -1952,8 +1991,6 @@ authpgsqlrc.h: | @@ -1953,8 +1989,6 @@ authpgsqlrc.h: | ||||
| @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@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \ | ||||
| @HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist | @HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist | ||||
| -@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist | -@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist | ||||
| -@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist | -@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist | ||||
| @HAVE_LDAP_TRUE@uninstall-authldaprc: | @HAVE_LDAP_TRUE@uninstall-authldaprc: | ||||
| @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist | @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist | ||||
| @@ -1964,6 +2001,18 @@ authpgsqlrc.h: | @@ -1965,6 +1999,18 @@ authpgsqlrc.h: | ||||
| @HAVE_LDAP_FALSE@uninstall-authldaprc: | @HAVE_LDAP_FALSE@uninstall-authldaprc: | ||||
| @HAVE_LDAP_FALSE@ @: | @HAVE_LDAP_FALSE@ @: | ||||
| +@HAVE_LDAP_TRUE@install-ldapschema: | +@HAVE_LDAP_TRUE@install-ldapschema: | ||||
| +@HAVE_LDAP_TRUE@ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema | +@HAVE_LDAP_TRUE@ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema | ||||
| +@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ | +@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ | ||||
| +@HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist | +@HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist | ||||
| +@HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \ | +@HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \ | ||||
| +@HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ | +@HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ | ||||
| +@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \ | +@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \ | ||||
| +@HAVE_LDAP_TRUE@# fi | +@HAVE_LDAP_TRUE@# fi | ||||
| + | + | ||||
| +@HAVE_LDAP_FALSE@install-ldapschema: | +@HAVE_LDAP_FALSE@install-ldapschema: | ||||
| +@HAVE_LDAP_FALSE@ @: | +@HAVE_LDAP_FALSE@ @: | ||||
| + | + | ||||
| authldaprc.h: | authldaprc.h: | ||||
| echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h | echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h | ||||
| @@ -1971,8 +2020,6 @@ authldaprc.h: | @@ -1972,8 +2018,6 @@ authldaprc.h: | ||||
| @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@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \ | ||||
| @HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist | @HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist | ||||
| -@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist | -@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist | ||||
| -@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist | -@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist | ||||
| @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: | @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: | ||||
| @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist | @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist | ||||
| @@ -1990,8 +2037,6 @@ authmysqlrc.h: | @@ -1991,8 +2035,6 @@ authmysqlrc.h: | ||||
| @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : | @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : | ||||
| @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ | @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ | ||||
| @HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc@.dist | @HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc@.dist | ||||
| -@HAVE_AUTHSQLITE_TRUE@ -chown @mailuser@ $(DESTDIR)@authsqliterc@.dist | -@HAVE_AUTHSQLITE_TRUE@ -chown @mailuser@ $(DESTDIR)@authsqliterc@.dist | ||||
| -@HAVE_AUTHSQLITE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist | -@HAVE_AUTHSQLITE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist | ||||
| @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: | @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: | ||||
| @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist | @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist | ||||
| @@ -2010,17 +2055,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc | @@ -2011,17 +2053,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc | ||||
| authpiperc.h: | authpiperc.h: | ||||
| echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h | echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h | ||||
| -install-authdaemonrc: | -install-authdaemonrc: | ||||
| - $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : | - $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : | ||||
| - sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp | - 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 | - rm -f authdaemonrc.tmp | ||||
| Show All 14 Lines | |||||
| +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)@authdaemonrc@.dist | +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)@authdaemonrc@.dist | ||||
| + | + | ||||
| +@HAVE_BASE_FALSE@uninstall-authdaemonrc: | +@HAVE_BASE_FALSE@uninstall-authdaemonrc: | ||||
| +@HAVE_BASE_FALSE@ @: | +@HAVE_BASE_FALSE@ @: | ||||
| + | + | ||||
| authdaemonrc.h: | authdaemonrc.h: | ||||
| echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h | echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h | ||||
| echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h | echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h | ||||
| @@ -2066,24 +2115,24 @@ dist-hook: | @@ -2067,24 +2113,24 @@ dist-hook: | ||||
| # automake still a bit stupid... | # automake still a bit stupid... | ||||
| install-data-hook: install-authdaemonrc install-authpgsqlrc \ | install-data-hook: install-authdaemonrc install-authpgsqlrc \ | ||||
| - install-authldaprc install-authmysqlrc install-authsqliterc | - install-authldaprc install-authmysqlrc install-authsqliterc | ||||
| + install-authldaprc install-ldapschema install-authmysqlrc install-authsqliterc | + install-authldaprc install-ldapschema install-authmysqlrc install-authsqliterc | ||||
| : | : | ||||
| install-exec-hook: | install-exec-hook: | ||||
| Show All 20 Lines | +@HAVE_BASE_TRUE@ chmod 750 $(DESTDIR)@authdaemonvar@ | ||||
| test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ | test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ | ||||
| $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \ | $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \ | ||||
| $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ | $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ | ||||
| + $(INSTALL_SCRIPT) userdb/vchkpw2userdb \ | + $(INSTALL_SCRIPT) userdb/vchkpw2userdb \ | ||||
| + $(DESTDIR)$(sbindir)/vchkpw2userdb ; \ | + $(DESTDIR)$(sbindir)/vchkpw2userdb ; \ | ||||
| $(INSTALL_SCRIPT) userdb/pw2userdb \ | $(INSTALL_SCRIPT) userdb/pw2userdb \ | ||||
| $(DESTDIR)$(sbindir)/pw2userdb ; \ | $(DESTDIR)$(sbindir)/pw2userdb ; \ | ||||
| $(INSTALL_SCRIPT) userdb/makeuserdb \ | $(INSTALL_SCRIPT) userdb/makeuserdb \ | ||||
| @@ -2096,9 +2145,10 @@ install-exec-hook: | @@ -2097,9 +2143,10 @@ install-exec-hook: | ||||
| $(DESTDIR)$(sbindir)/userdb-test-cram-md5 | $(DESTDIR)$(sbindir)/userdb-test-cram-md5 | ||||
| uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc | uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc | ||||
| - rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond | - rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond | ||||
| +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond | +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond | ||||
| test "@AUTHUSERDB@" = "" && exit 0 ;\ | test "@AUTHUSERDB@" = "" && exit 0 ;\ | ||||
| rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \ | rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \ | ||||
| + $(DESTDIR)$(sbindir)/vchkpw2userdb \ | + $(DESTDIR)$(sbindir)/vchkpw2userdb \ | ||||
| $(DESTDIR)$(sbindir)/pw2userdb \ | $(DESTDIR)$(sbindir)/pw2userdb \ | ||||
| $(DESTDIR)$(sbindir)/makeuserdb \ | $(DESTDIR)$(sbindir)/makeuserdb \ | ||||
| $(DESTDIR)$(sbindir)/userdb \ | $(DESTDIR)$(sbindir)/userdb \ | ||||
| @@ -2109,7 +2159,7 @@ authlib.html: authlib.html.in | @@ -2110,7 +2157,7 @@ authlib.html: authlib.html.in | ||||
| $(SHELL) ./config.status --file=authlib.html | $(SHELL) ./config.status --file=authlib.html | ||||
| authlib.3: authlib.3.in | authlib.3: authlib.3.in | ||||
| - $(SHELL) ./config.status --file=authlib.3 | - $(SHELL) ./config.status --file=authlib.3 | ||||
| +@HAVE_BASE_TRUE@ $(SHELL) ./config.status --file=authlib.3 | +@HAVE_BASE_TRUE@ $(SHELL) ./config.status --file=authlib.3 | ||||
| @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html | @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html | ||||
| @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html | @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html | ||||