manual merge of the distrib/ part from a prerelease of 0.30.215

[util-vserver.git] / distrib / Makefile.in

diff --git a/distrib/Makefile.in b/distrib/Makefile.in
index 31cde76..c0dbda7 100644 (file)
--- a/distrib/Makefile.in
+++ b/distrib/Makefile.in
@@ -108,6 +108,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENSC_CRYPTO_CFLAGS = @ENSC_CRYPTO_CFLAGS@
+ENSC_CRYPTO_LIB = @ENSC_CRYPTO_LIB@
 ENSC_PATHPROG_SED = @ENSC_PATHPROG_SED@
 ENSC_USE_EXPENSIVE_TESTS = @ENSC_USE_EXPENSIVE_TESTS@
 ENV = @ENV@
@@ -115,6 +117,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE = @FILE@
+FSCK = @FSCK@
 GPG_KEY = @GPG_KEY@
 GREP = @GREP@
 GZIP = @GZIP@
@@ -145,6 +148,8 @@ MV = @MV@
 NAMEIF = @NAMEIF@
 NICE = @NICE@
 NOHUP = @NOHUP@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_LIBS = @NSS_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -153,6 +158,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 PS = @PS@
 RANLIB = @RANLIB@
 RELEASE_CPPFLAGS = @RELEASE_CPPFLAGS@
@@ -252,7 +258,9 @@ nobase_distrib_SCRIPTS = redhat/initpost \
                           redhat/rc.sysinit \
                           gentoo/initpost \
                           gentoo/initpre \
-                          debian/initpost
+                          debian/initpost \
+                          alpine/initpre \
+                          alpine/initpost
 
 nobase_distrib_DATA = defaults/devs \
                           defaults/apt.conf \
@@ -277,6 +285,9 @@ nobase_distrib_DATA = defaults/devs \
                           f7/apt/rpmpriorities    f7/pkgs/01    f7/pkgs/02    f7/pkgs/03 \
                           f7/yum/yum.conf $(wildcard f7/yum.repos.d/*.repo) \
                           $(wildcard f7/rpmlist.d/*.lst) $(wildcard f7/rpmlist.d/*.opt) \
+                          f8/apt/rpmpriorities    f8/pkgs/01    f8/pkgs/02    f8/pkgs/03 \
+                          f8/yum/yum.conf $(wildcard f8/yum.repos.d/*.repo) \
+                          $(wildcard f8/rpmlist.d/*.lst) $(wildcard f8/rpmlist.d/*.opt) \
                           centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \
                           centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \
                           centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \
@@ -306,7 +317,7 @@ EXTRA_DIST = $(nobase_distrib_DATA) \
                           $(nobase_confdistrib_DATA) \
                           $(defaults_DATA)
 
-redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 centos4 centos5
+redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 centos4 centos5
 sid_style = etch lenny sid
 all: all-am
 
@@ -320,9 +331,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits  distrib/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  distrib/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnits  distrib/Makefile
+         $(AUTOMAKE) --gnu  distrib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -366,22 +377,6 @@ uninstall-nobase_distribSCRIPTS:
          rm -f "$(DESTDIR)$(distribdir)/$$f"; \
        done
 
-installcheck-nobase_distribSCRIPTS: $(nobase_distrib_SCRIPTS)
-       bad=0; pid=$$$$; list="$(nobase_distrib_SCRIPTS)"; for p in $$list; do \
-         case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
-          *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
-         esac; \
-         f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
-         f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-         for opt in --help --version; do \
-           if "$(DESTDIR)$(distribdir)/$$f" $$opt >c$${pid}_.out \
-                2>c$${pid}_.err </dev/null \
-                && test -n "`cat c$${pid}_.out`" \
-                && test -z "`cat c$${pid}_.err`"; then :; \
-           else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-         done; \
-       done; rm -f c$${pid}_.???; exit $$bad
-
 mostlyclean-libtool:
        -rm -f *.lo
 
@@ -545,7 +540,7 @@ install-pdf: install-pdf-am
 
 install-ps: install-ps-am
 
-installcheck-am: installcheck-nobase_distribSCRIPTS
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
        -rm -f Makefile
@@ -578,12 +573,11 @@ uninstall-am: uninstall-defaultsDATA uninstall-nobase_confdistribDATA \
        install-nobase_confdistribDATA install-nobase_distribDATA \
        install-nobase_distribSCRIPTS install-pdf install-pdf-am \
        install-ps install-ps-am install-strip installcheck \
-       installcheck-am installcheck-nobase_distribSCRIPTS installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-defaultsDATA \
-       uninstall-nobase_confdistribDATA uninstall-nobase_distribDATA \
-       uninstall-nobase_distribSCRIPTS
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-defaultsDATA uninstall-nobase_confdistribDATA \
+       uninstall-nobase_distribDATA uninstall-nobase_distribSCRIPTS
 
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \