summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-02 09:19:02 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-02 09:19:02 +0000
commitb009a084ebc53d4fb2d904db26fd61f87bf60e54 (patch)
tree3d896edd730c29a5ae9c77a8d627d41589665e3d /Build/source/texk/web2c/configure
parent6822a6b49452b0f8b5a3ce1781c59e766f7cfaba (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')
-rwxr-xr-xBuild/source/texk/web2c/configure53
1 files changed, 33 insertions, 20 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 2fad4a808dd..2e60c725ba9 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -641,6 +641,10 @@ subdirs
WANTEDLIBS
SYNCTEX_LT_VERSINFO
SYNCTEXVERSION
+SYNCTEX_FALSE
+SYNCTEX_TRUE
+SYSTEM_ZLIB_FALSE
+SYSTEM_ZLIB_TRUE
OTANGLE
TIE
CTANGLE
@@ -731,8 +735,6 @@ UPWEB_FALSE
UPWEB_TRUE
PWEB_FALSE
PWEB_TRUE
-SYNCTEX_FALSE
-SYNCTEX_TRUE
WEB_FALSE
WEB_TRUE
wlibs
@@ -3363,11 +3365,6 @@ 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),
@@ -20396,15 +20393,6 @@ else
fi
- if test "x$enable_synctex" != xno; then
- SYNCTEX_TRUE=
- SYNCTEX_FALSE='#'
-else
- SYNCTEX_TRUE='#'
- SYNCTEX_FALSE=
-fi
-
-
if test "x$enable_ptex:$enable_eptex" = xno:no; then :
enable_pweb_progs=no
else
@@ -24134,6 +24122,25 @@ ac_config_files="$ac_config_files ctangleboot-sh"
ac_config_files="$ac_config_files silent-sh"
+## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
+ if test "x$with_system_zlib" = xyes; then
+ SYSTEM_ZLIB_TRUE=
+ SYSTEM_ZLIB_FALSE='#'
+else
+ SYSTEM_ZLIB_TRUE='#'
+ SYSTEM_ZLIB_FALSE=
+fi
+
+
+ if test "x$enable_synctex" != xno; then
+ SYNCTEX_TRUE=
+ SYNCTEX_FALSE='#'
+else
+ SYNCTEX_TRUE='#'
+ SYNCTEX_FALSE=
+fi
+
+
SYNCTEXVERSION=1.17.0
@@ -24148,6 +24155,8 @@ fi
ac_config_files="$ac_config_files synctexdir/synctex.pc"
+
+
if test "x$host_alias" != x && test "x$build_alias" = x; then :
as_fn_error $? "when cross-compiling you must specify both --host and --build." "$LINENO" 5
fi
@@ -24437,10 +24446,6 @@ if test -z "${WEB_TRUE}" && test -z "${WEB_FALSE}"; then
as_fn_error $? "conditional \"WEB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${SYNCTEX_TRUE}" && test -z "${SYNCTEX_FALSE}"; then
- as_fn_error $? "conditional \"SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PWEB_TRUE}" && test -z "${PWEB_FALSE}"; then
as_fn_error $? "conditional \"PWEB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24450,6 +24455,14 @@ if test -z "${UPWEB_TRUE}" && test -z "${UPWEB_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${SYSTEM_ZLIB_TRUE}" && test -z "${SYSTEM_ZLIB_FALSE}"; then
+ as_fn_error $? "conditional \"SYSTEM_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${SYNCTEX_TRUE}" && test -z "${SYNCTEX_FALSE}"; then
+ as_fn_error $? "conditional \"SYNCTEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0