summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-28 10:28:44 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-28 10:28:44 +0000
commit2cbe0517df9daa71a49132982036b5c120e472fd (patch)
treec02ad3ca612f852c77a62c90b5105727255a1b44 /Build/source
parentd6f28a4f2581a1e325dd3e8e3f2fa322b0785412 (diff)
texk/web2c: Build fix for libsynctex - the SyncTeX parser library
git-svn-id: svn://tug.org/texlive/trunk@34467 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/configure9
-rwxr-xr-xBuild/source/libs/configure9
-rw-r--r--Build/source/texk/kpathsea/kpathsea.pc.in2
-rw-r--r--Build/source/texk/ptexenc/ptexenc.pc.in2
-rw-r--r--Build/source/texk/web2c/Makefile.in201
-rwxr-xr-xBuild/source/texk/web2c/configure10
-rw-r--r--Build/source/texk/web2c/configure.ac8
-rw-r--r--Build/source/texk/web2c/doc/Makefile.in1
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in1
-rw-r--r--Build/source/texk/web2c/man/Makefile.in1
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in1
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in1
-rw-r--r--Build/source/texk/web2c/otps/win32/Makefile.in1
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am10
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex.pc.in2
-rw-r--r--Build/source/texk/web2c/window/Makefile.in1
-rwxr-xr-xBuild/source/utils/configure9
17 files changed, 178 insertions, 91 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 76d89b5e5f0..471864bbc4a 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -836,6 +836,7 @@ enable_suntoolswin
enable_tektronixwin
enable_unitermwin
enable_web_progs
+enable_synctex
enable_afm2pl
enable_bibtex_x
enable_bibtex8
@@ -1647,6 +1648,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
+ --disable-synctex do not build the SyncTeX tool
--disable-afm2pl do not build the afm2pl package
--disable-bibtex-x do not build the bibtex-x package
--disable-bibtex8 do not build the bibtex8 program
@@ -4673,6 +4675,13 @@ if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
+## configure option for the SyncTeX tool
+# Check whether --enable-synctex was given.
+if test "${enable_synctex+set}" = set; then :
+ enableval=$enable_synctex;
+fi
+
+
## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
## configure options and TL libraries required for afm2pl
# Check whether --enable-afm2pl was given.
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index d6e132433bc..c35c46356cc 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -748,6 +748,7 @@ enable_suntoolswin
enable_tektronixwin
enable_unitermwin
enable_web_progs
+enable_synctex
enable_afm2pl
enable_bibtex_x
enable_bibtex8
@@ -1555,6 +1556,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
+ --disable-synctex do not build the SyncTeX tool
--disable-afm2pl do not build the afm2pl package
--disable-bibtex-x do not build the bibtex-x package
--disable-bibtex8 do not build the bibtex8 program
@@ -3925,6 +3927,13 @@ if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
+## configure option for the SyncTeX tool
+# Check whether --enable-synctex was given.
+if test "${enable_synctex+set}" = set; then :
+ enableval=$enable_synctex;
+fi
+
+
## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
## configure options and TL libraries required for afm2pl
# Check whether --enable-afm2pl was given.
diff --git a/Build/source/texk/kpathsea/kpathsea.pc.in b/Build/source/texk/kpathsea/kpathsea.pc.in
index 7cda2c9cd3f..865f5408ab5 100644
--- a/Build/source/texk/kpathsea/kpathsea.pc.in
+++ b/Build/source/texk/kpathsea/kpathsea.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
Name: kpathsea
-Description: Kpathsea library
+Description: Kpathsea filename lookup library
Version: @KPSEVERSION@
Libs: -L${libdir} -lkpathsea
Cflags: -I${includedir}
diff --git a/Build/source/texk/ptexenc/ptexenc.pc.in b/Build/source/texk/ptexenc/ptexenc.pc.in
index 3303ef65ef4..f5bfef6687c 100644
--- a/Build/source/texk/ptexenc/ptexenc.pc.in
+++ b/Build/source/texk/ptexenc/ptexenc.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
Name: ptexenc
-Description: Ptexenc library
+Description: Ptexenc pTeX encoding library
Version: @PTEXENCVERSION@
Requires.private: kpathsea
Libs: -L${libdir} -lptexenc
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 7fdb6db242e..822e391668f 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -16,6 +16,7 @@
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -142,7 +143,7 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
$(top_srcdir)/synctexdir/synctex.pc.in \
$(top_srcdir)/../texlive/w32_wrapper/callexe.c \
$(top_srcdir)/../../build-aux/depcomp $(dist_man_MANS) \
- $(am__nobase_include_HEADERS_DIST) \
+ $(am__syncinclude_HEADERS_DIST) \
$(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \
NEWS README ../../build-aux/compile \
../../build-aux/config.guess ../../build-aux/config.sub \
@@ -908,6 +909,37 @@ am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT) \
xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_22) \
$(am__objects_23)
libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libsynctex_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libsynctex_la_OBJECTS = synctexdir/libsynctex_la-synctex_parser.lo \
@@ -958,9 +990,6 @@ am__EXEEXT_6 = $(am__EXEEXT_4) $(am__EXEEXT_5)
@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_26 = $(am__EXEEXT_5)
@ALEPH_TRUE@am__EXEEXT_27 = aleph$(EXEEXT)
@SYNCTEX_TRUE@am__EXEEXT_28 = synctex$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
- "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(includedir)"
@TEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@TEX_TRUE@ tftopl$(EXEEXT)
@MF_TRUE@am__EXEEXT_30 = gftype$(EXEEXT) tftopl$(EXEEXT)
@@ -1492,41 +1521,14 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
NROFF = nroff
MANS = $(dist_man_MANS) $(nodist_man_MANS)
DATA = $(pkgconfig_DATA)
-am__nobase_include_HEADERS_DIST = synctexdir/synctex_parser.h \
+am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
synctexdir/synctex_parser_utils.h
-HEADERS = $(nobase_include_HEADERS)
+HEADERS = $(syncinclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -1920,6 +1922,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
@@ -3394,6 +3397,7 @@ synctex_SOURCES = \
synctex_CPPFLAGS = -I$(srcdir)/synctexdir
synctex_LDADD = libsynctex.la $(ZLIB_LIBS)
EXTRA_LTLIBRARIES = libsynctex.la
+lib_LTLIBRARIES = $(WANTEDLIBS)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
libsynctex_la_SOURCES = \
@@ -3402,7 +3406,8 @@ libsynctex_la_SOURCES = \
synctexdir/synctex_parser_utils.c
libsynctex_la_LIBADD = $(ZLIB_LIBS)
-@SYNCTEX_TRUE@nobase_include_HEADERS = \
+syncincludedir = ${includedir}/synctex
+@SYNCTEX_TRUE@syncinclude_HEADERS = \
@SYNCTEX_TRUE@ synctexdir/synctex_parser.h \
@SYNCTEX_TRUE@ synctexdir/synctex_parser_utils.h
@@ -4483,6 +4488,41 @@ libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_
$(AM_V_at)-rm -f libxetex.a
$(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
$(AM_V_at)$(RANLIB) libxetex.a
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ done
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
synctexdir/libsynctex_la-synctex_parser.lo: \
synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -13165,30 +13205,27 @@ uninstall-pkgconfigDATA:
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
+install-syncincludeHEADERS: $(syncinclude_HEADERS)
@$(NORMAL_INSTALL)
- @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ @list='$(syncinclude_HEADERS)'; test -n "$(syncincludedir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(syncincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(syncincludedir)" || exit 1; \
fi; \
- $(am__nobase_list) | while read dir files; do \
- xfiles=; for file in $$files; do \
- if test -f "$$file"; then xfiles="$$xfiles $$file"; \
- else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
- test -z "$$xfiles" || { \
- test "x$$dir" = x. || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
- $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
- echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
- $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(syncincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(syncincludedir)" || exit $$?; \
done
-uninstall-nobase_includeHEADERS:
+uninstall-syncincludeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
- $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
- dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+ @list='$(syncinclude_HEADERS)'; test -n "$(syncincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(syncincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -13738,10 +13775,13 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) ff-config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) \
+ ff-config.h
+install-binPROGRAMS: install-libLTLIBRARIES
+
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -13835,11 +13875,11 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@SYNCTEX_FALSE@install-exec-local:
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
- clean-libtool clean-local clean-noinstPROGRAMS mostlyclean-am
+ clean-libLTLIBRARIES clean-libtool clean-local \
+ clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -13860,14 +13900,14 @@ info: info-recursive
info-am:
-install-data-am: install-man install-nobase_includeHEADERS \
- install-pkgconfigDATA
+install-data-am: install-man install-pkgconfigDATA \
+ install-syncincludeHEADERS
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-exec-local
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
@@ -13910,8 +13950,9 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-man \
- uninstall-nobase_includeHEADERS uninstall-pkgconfigDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+ uninstall-man uninstall-pkgconfigDATA \
+ uninstall-syncincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1 uninstall-man5
@@ -13921,27 +13962,28 @@ uninstall-man: uninstall-man1 uninstall-man5
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
- clean-checkPROGRAMS clean-cscope clean-generic clean-libtool \
- clean-local clean-noinstPROGRAMS cscope cscopelist-am ctags \
- ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
- dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
- distclean distclean-compile distclean-generic distclean-hdr \
+ clean-checkPROGRAMS clean-cscope clean-generic \
+ clean-libLTLIBRARIES clean-libtool clean-local \
+ clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+ dist-tarZ dist-xz 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 \
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-exec-hook install-exec-local \
- install-html install-html-am install-info install-info-am \
- install-man install-man1 install-man5 \
- install-nobase_includeHEADERS install-pdf install-pdf-am \
- install-pkgconfigDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-hook \
+ install-exec-am install-exec-hook install-html install-html-am \
+ install-info install-info-am install-libLTLIBRARIES \
+ install-man install-man1 install-man5 install-pdf \
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+ install-strip install-syncincludeHEADERS installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-hook uninstall-libLTLIBRARIES \
uninstall-man uninstall-man1 uninstall-man5 \
- uninstall-nobase_includeHEADERS uninstall-pkgconfigDATA
+ uninstall-pkgconfigDATA uninstall-syncincludeHEADERS
dist-hook:
@@ -14876,11 +14918,6 @@ aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
$(synctex_OBJECTS): libsynctex.la
$(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
-
-@SYNCTEX_TRUE@install-exec-local: libsynctex.la
-@SYNCTEX_TRUE@ $(MKDIR_P) "$(DESTDIR)$(libdir)"
-@SYNCTEX_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) \
-@SYNCTEX_TRUE@ libsynctex.la "$(DESTDIR)$(libdir)"
.PHONY: install-bin-links uninstall-bin-links
install-bin-links:
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 96121212946..2fad4a808dd 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -638,6 +638,7 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
subdirs
+WANTEDLIBS
SYNCTEX_LT_VERSINFO
SYNCTEXVERSION
OTANGLE
@@ -3362,6 +3363,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
WEB2CVERSION=2015/dev
+if test "x$enable_shared:$with_system_zlib" = xyes:no; then
+ enable_shared=no
+ ac_configure_args="$ac_configure_args '--disable-shared'"
+fi
+
am__api_version='1.14'
# Find a good install program. We prefer a C program (faster),
@@ -24134,6 +24140,10 @@ SYNCTEXVERSION=1.17.0
SYNCTEX_LT_VERSINFO=18:0:17
+if test "x$enable_synctex" != xno; then :
+ WANTEDLIBS=libsynctex.la
+
+fi
ac_config_files="$ac_config_files synctexdir/synctex.pc"
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 06b0f4befa9..34788c9c681 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -33,6 +33,12 @@ AC_CONFIG_MACRO_DIRS([../../m4 m4])
WEB2CVERSION=tex_live_version()
AC_SUBST([WEB2CVERSION])
+dnl Building a shared libsynctex requires a system zlib
+if test "x$enable_shared:$with_system_zlib" = xyes:no; then
+ enable_shared=no
+ ac_configure_args="$ac_configure_args '--disable-shared'"
+fi
+
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([web2c programs])
@@ -388,6 +394,8 @@ AC_CONFIG_FILES([silent-sh], [chmod +x silent-sh])
m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_version.txt]))[.0])
AC_SUBST([SYNCTEXVERSION], [synctex_version])
KPSE_LT_VERSION([synctex])
+AS_IF([test "x$enable_synctex" != xno],
+ [AC_SUBST([WANTEDLIBS], [libsynctex.la])])
AC_CONFIG_FILES([synctexdir/synctex.pc])
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 41d6b21798e..2cd8f18be83 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -357,6 +357,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 8d62ea36491..694a3a3dd95 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -353,6 +353,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 324e17360f7..3b70be3374d 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -334,6 +334,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index b0ffb33b774..116b8fb63ed 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -579,6 +579,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 40f7b18a6b6..b49191bc25d 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -618,6 +618,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in
index 1fd18db4783..75f48ced5fd 100644
--- a/Build/source/texk/web2c/otps/win32/Makefile.in
+++ b/Build/source/texk/web2c/otps/win32/Makefile.in
@@ -341,6 +341,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 1482aa5ebc4..9f614d148aa 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -22,6 +22,7 @@ $(synctex_OBJECTS): libsynctex.la
## The SyncTeX parser library
EXTRA_LTLIBRARIES = libsynctex.la
+lib_LTLIBRARIES = $(WANTEDLIBS)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
@@ -36,13 +37,10 @@ libsynctex_la_LIBADD = $(ZLIB_LIBS)
$(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
-if SYNCTEX
-install-exec-local: libsynctex.la
- $(MKDIR_P) "$(DESTDIR)$(libdir)"
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) \
- libsynctex.la "$(DESTDIR)$(libdir)"
+syncincludedir = ${includedir}/synctex
-nobase_include_HEADERS = \
+if SYNCTEX
+syncinclude_HEADERS = \
synctexdir/synctex_parser.h \
synctexdir/synctex_parser_utils.h
endif SYNCTEX
diff --git a/Build/source/texk/web2c/synctexdir/synctex.pc.in b/Build/source/texk/web2c/synctexdir/synctex.pc.in
index 65532875038..7da4eead618 100644
--- a/Build/source/texk/web2c/synctexdir/synctex.pc.in
+++ b/Build/source/texk/web2c/synctexdir/synctex.pc.in
@@ -8,5 +8,5 @@ Description: SyncTeX parser library
Version: @SYNCTEXVERSION@
Requires.private: zlib
Libs: -L${libdir} -lsynctex
-Cflags: -I${includedir}
+Cflags: -I${includedir}/synctex
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index de25636f4a9..fa98cfc2190 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -351,6 +351,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 05691c09d38..6a54444354c 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -748,6 +748,7 @@ enable_suntoolswin
enable_tektronixwin
enable_unitermwin
enable_web_progs
+enable_synctex
enable_afm2pl
enable_bibtex_x
enable_bibtex8
@@ -1545,6 +1546,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
+ --disable-synctex do not build the SyncTeX tool
--disable-afm2pl do not build the afm2pl package
--disable-bibtex-x do not build the bibtex-x package
--disable-bibtex8 do not build the bibtex8 program
@@ -3915,6 +3917,13 @@ if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
+## configure option for the SyncTeX tool
+# Check whether --enable-synctex was given.
+if test "${enable_synctex+set}" = set; then :
+ enableval=$enable_synctex;
+fi
+
+
## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
## configure options and TL libraries required for afm2pl
# Check whether --enable-afm2pl was given.