diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-07-02 09:19:02 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-07-02 09:19:02 +0000 |
| commit | b009a084ebc53d4fb2d904db26fd61f87bf60e54 (patch) | |
| tree | 3d896edd730c29a5ae9c77a8d627d41589665e3d /Build/source/texk/web2c/synctexdir | |
| parent | 6822a6b49452b0f8b5a3ce1781c59e766f7cfaba (diff) | |
texk/web2c: Better handling of shared vs nonshared libsynctex
git-svn-id: svn://tug.org/texlive/trunk@34498 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/synctexdir')
| -rw-r--r-- | Build/source/texk/web2c/synctexdir/ac/synctex.ac | 20 | ||||
| -rw-r--r-- | Build/source/texk/web2c/synctexdir/am/synctex.am | 33 |
2 files changed, 44 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/synctexdir/ac/synctex.ac b/Build/source/texk/web2c/synctexdir/ac/synctex.ac new file mode 100644 index 00000000000..5ecc2fa085b --- /dev/null +++ b/Build/source/texk/web2c/synctexdir/ac/synctex.ac @@ -0,0 +1,20 @@ +## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ +dnl +dnl Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl +dnl Additional code for synctex +dnl +dnl Building libsynctex as shared library requires a system zlib +AM_CONDITIONAL([SYSTEM_ZLIB], [test "x$with_system_zlib" = xyes]) + +AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno]) + +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/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am index 9f614d148aa..4a853f5e532 100644 --- a/Build/source/texk/web2c/synctexdir/am/synctex.am +++ b/Build/source/texk/web2c/synctexdir/am/synctex.am @@ -15,39 +15,54 @@ synctex_SOURCES = \ synctex_CPPFLAGS = -I$(srcdir)/synctexdir -synctex_LDADD = libsynctex.la $(ZLIB_LIBS) +if SYSTEM_ZLIB +libsynctex = libsynctex.la +else !SYSTEM_ZLIB +libsynctex = libsynctex.a +endif !SYSTEM_ZLIB -$(synctex_OBJECTS): libsynctex.la +synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) -## The SyncTeX parser library +$(synctex_OBJECTS): $(libsynctex) + +## The (shared or nonshared) SyncTeX parser library EXTRA_LTLIBRARIES = libsynctex.la +EXTRA_LIBRARIES += libsynctex.a + +if SYNCTEX +if SYSTEM_ZLIB lib_LTLIBRARIES = $(WANTEDLIBS) +else !SYSTEM_ZLIB +lib_LIBRARIES = libsynctex.a +endif !SYSTEM_ZLIB +endif SYNCTEX libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER +libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS) libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO) +libsynctex_la_LIBADD = $(ZLIB_LIBS) + libsynctex_la_SOURCES = \ synctexdir/synctex_parser.c \ synctexdir/synctex_parser_local.h \ synctexdir/synctex_parser_utils.c - -libsynctex_la_LIBADD = $(ZLIB_LIBS) +nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES) $(libsynctex_la_OBJECTS): $(ZLIB_DEPEND) +$(libsynctex_a_OBJECTS): $(ZLIB_DEPEND) syncincludedir = ${includedir}/synctex +pkgconfigdir = ${libdir}/pkgconfig + if SYNCTEX syncinclude_HEADERS = \ synctexdir/synctex_parser.h \ synctexdir/synctex_parser_utils.h -endif SYNCTEX -pkgconfigdir = ${libdir}/pkgconfig - -if SYNCTEX pkgconfig_DATA = synctexdir/synctex.pc endif SYNCTEX |