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/configure.ac | |
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/configure.ac')
-rw-r--r-- | Build/source/texk/web2c/configure.ac | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 34788c9c681..451212f36f0 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -33,13 +33,6 @@ 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]) AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) @@ -208,8 +201,6 @@ AM_CONDITIONAL([MP], [test "x$enable_mp" != xno]) AM_CONDITIONAL([WEB], [test "x$enable_web_progs" != xno]) -AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno]) - AS_IF([test "x$enable_ptex:$enable_eptex" = xno:no], [enable_pweb_progs=no], [enable_pweb_progs=$enable_web_progs]) @@ -391,13 +382,8 @@ AC_CONFIG_FILES([tangle-sh], [chmod +x tangle-sh]) AC_CONFIG_FILES([ctangleboot-sh], [chmod +x ctangleboot-sh]) 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]) +dnl Additional code for synctex +m4_sinclude([synctexdir/ac/synctex.ac]) dnl The subdirectory web2c must be configured for the build system. KPSE_NATIVE_SUBDIRS([web2c]) |