Skip to content

Commit 92965a4

Browse files
committed
Check in 1.7.1
1 parent af4189b commit 92965a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+9998
-8081
lines changed

LSQUICCOMMIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
aedecb458e1f4103993aa4efba0557e627f14e35
1+
f4bfba069bd281258ce72183fd9d274168e9050c

Makefile.in

+35-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.13.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.15.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
1414

1515
@SET_MAKE@
1616
VPATH = @srcdir@
17-
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17+
am__is_gnu_make = { \
18+
if test -z '$(MAKELEVEL)'; then \
19+
false; \
20+
elif test -n '$(MAKE_HOST)'; then \
21+
true; \
22+
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23+
true; \
24+
else \
25+
false; \
26+
fi; \
27+
}
1828
am__make_running_with_option = \
1929
case $${target_option-} in \
2030
?) ;; \
@@ -78,9 +88,6 @@ POST_UNINSTALL = :
7888
build_triplet = @build@
7989
host_triplet = @host@
8090
subdir = .
81-
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
82-
$(top_srcdir)/configure $(am__configure_deps) INSTALL \
83-
config.guess config.sub depcomp install-sh missing ltmain.sh
8491
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8592
am__aclocal_m4_deps = $(top_srcdir)/ax_check_zlib.m4 \
8693
$(top_srcdir)/ax_check_openssl.m4 \
@@ -91,6 +98,8 @@ am__aclocal_m4_deps = $(top_srcdir)/ax_check_zlib.m4 \
9198
$(top_srcdir)/configure.ac
9299
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
93100
$(ACLOCAL_M4)
101+
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
102+
$(am__configure_deps) $(am__DIST_COMMON)
94103
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
95104
configure.lineno config.status.lineno
96105
mkinstalldirs = $(install_sh) -d
@@ -153,6 +162,8 @@ ETAGS = etags
153162
CTAGS = ctags
154163
CSCOPE = cscope
155164
DIST_SUBDIRS = $(SUBDIRS)
165+
am__DIST_COMMON = $(srcdir)/Makefile.in INSTALL compile config.guess \
166+
config.sub depcomp install-sh ltmain.sh missing
156167
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
157168
distdir = $(PACKAGE)-$(VERSION)
158169
top_distdir = $(distdir)
@@ -248,6 +259,7 @@ LIBTOOL = @LIBTOOL@
248259
LIPO = @LIPO@
249260
LN_S = @LN_S@
250261
LTLIBOBJS = @LTLIBOBJS@
262+
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
251263
LUA_INCLUDES = @LUA_INCLUDES@
252264
MAKEINFO = @MAKEINFO@
253265
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -341,6 +353,7 @@ pdfdir = @pdfdir@
341353
prefix = @prefix@
342354
program_transform_name = @program_transform_name@
343355
psdir = @psdir@
356+
runstatedir = @runstatedir@
344357
sbindir = @sbindir@
345358
sharedstatedir = @sharedstatedir@
346359
srcdir = @srcdir@
@@ -370,7 +383,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
370383
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
371384
$(am__cd) $(top_srcdir) && \
372385
$(AUTOMAKE) --foreign Makefile
373-
.PRECIOUS: Makefile
374386
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
375387
@case '$?' in \
376388
*config.status*) \
@@ -570,7 +582,7 @@ distdir: $(DISTFILES)
570582
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
571583
|| chmod -R a+r "$(distdir)"
572584
dist-gzip: distdir
573-
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
585+
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
574586
$(am__post_remove_distdir)
575587

576588
dist-bzip2: distdir
@@ -586,11 +598,17 @@ dist-xz: distdir
586598
$(am__post_remove_distdir)
587599

588600
dist-tarZ: distdir
601+
@echo WARNING: "Support for distribution archives compressed with" \
602+
"legacy program 'compress' is deprecated." >&2
603+
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
589604
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
590605
$(am__post_remove_distdir)
591606

592607
dist-shar: distdir
593-
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
608+
@echo WARNING: "Support for shar distribution archives is" \
609+
"deprecated." >&2
610+
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
611+
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
594612
$(am__post_remove_distdir)
595613

596614
dist-zip: distdir
@@ -608,7 +626,7 @@ dist dist-all:
608626
distcheck: dist
609627
case '$(DIST_ARCHIVES)' in \
610628
*.tar.gz*) \
611-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
629+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
612630
*.tar.bz2*) \
613631
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
614632
*.tar.lz*) \
@@ -618,22 +636,23 @@ distcheck: dist
618636
*.tar.Z*) \
619637
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
620638
*.shar.gz*) \
621-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
639+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
622640
*.zip*) \
623641
unzip $(distdir).zip ;;\
624642
esac
625643
chmod -R a-w $(distdir)
626644
chmod u+w $(distdir)
627-
mkdir $(distdir)/_build $(distdir)/_inst
645+
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
628646
chmod a-w $(distdir)
629647
test -d $(distdir)/_build || exit 0; \
630648
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
631649
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
632650
&& am__cwd=`pwd` \
633-
&& $(am__cd) $(distdir)/_build \
634-
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
651+
&& $(am__cd) $(distdir)/_build/sub \
652+
&& ../../configure \
635653
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
636654
$(DISTCHECK_CONFIGURE_FLAGS) \
655+
--srcdir=../.. --prefix="$$dc_install_base" \
637656
&& $(MAKE) $(AM_MAKEFLAGS) \
638657
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
639658
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -812,6 +831,8 @@ uninstall-am:
812831
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
813832
uninstall-am
814833

834+
.PRECIOUS: Makefile
835+
815836

816837
install-data-hook:
817838
( cd dist; ./install.sh "$(DESTDIR)$(prefix)" "$(OPENLSWS_USER)" "$(OPENLSWS_GROUP)" "$(OPENLSWS_ADMIN)" "$(OPENLSWS_PASSWORD)" "$(OPENLSWS_EMAIL)" "$(OPENLSWS_ADMINSSL)" "$(OPENLSWS_ADMINPORT)" "$(USE_LSPHP7)" "$(DEFAULT_TMP_DIR)" "$(PID_FILE)" "$(OPENLSWS_EXAMPLEPORT)" "$(IS_LSCPD)" ;)

0 commit comments

Comments
 (0)