summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-12-19 11:06:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-12-19 11:06:18 +0000
commitf4a44885a367794f0ed41c0dd446df7b40a174d8 (patch)
treeff5f6f65c92699d23eea5a9c8578847ece736556 /Build/source/texk
parentdac42fa45e686717a350e950f3a68ad1cc5eec83 (diff)
Add a configure option to skip the linked scripts and still run texlinks
git-svn-id: svn://tug.org/texlive/trunk@32449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/Makefile.in1
-rwxr-xr-xBuild/source/texk/configure9
-rw-r--r--Build/source/texk/texlive/ChangeLog6
-rw-r--r--Build/source/texk/texlive/Makefile.am5
-rw-r--r--Build/source/texk/texlive/Makefile.in8
-rw-r--r--Build/source/texk/texlive/ac/texlive.ac11
-rw-r--r--Build/source/texk/texlive/ac/withenable.ac3
-rwxr-xr-xBuild/source/texk/texlive/configure26
-rw-r--r--Build/source/texk/texlive/configure.ac4
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in3
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in3
11 files changed, 72 insertions, 7 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index efd6c6eb99b..1a66ae00cc9 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -171,6 +171,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
$(top_srcdir)/../texk/xdvik/ac/xdvik.ac \
$(top_srcdir)/../texk/texlive/ac/withenable.ac \
+ $(top_srcdir)/../texk/texlive/ac/texlive.ac \
$(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \
$(top_srcdir)/../libs/icu/ac/withenable.ac \
$(top_srcdir)/../libs/teckit/ac/withenable.ac \
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index c1cd36b632b..ec827376f01 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -803,6 +803,7 @@ enable_ttfdump
enable_xdvik
with_xdvi_x_toolkit
enable_texlive
+enable_linked_scripts
with_system_harfbuzz
with_system_icu
with_system_teckit
@@ -1617,6 +1618,7 @@ Optional Features:
--disable-ttfdump do not build the ttfdump package
--disable-xdvik do not build the xdvik package
--disable-texlive do not build the texlive (TeX Live scripts) package
+ --disable-linked-scripts do not install the linked scripts
--disable-mktexmf-default do not run mktexmf if MF source missing
--disable-mktexpk-default do not run mktexpk if PK font missing
--disable-mktextfm-default do not run mktextfm if TFM file missing
@@ -4775,6 +4777,13 @@ $as_echo "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
;;
esac
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options for texlive
+# Check whether --enable-linked-scripts was given.
+if test "${enable_linked_scripts+set}" = set; then :
+ enableval=$enable_linked_scripts;
+fi
+
## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## configure options and TL libraries required for harfbuzz
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 2af32b58aff..3e2882b38a3 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/texlive.ac: New file for '--disable-linked-scripts'.
+ * Makefile.am, ac/withenable.ac, configure.ac: Add a configure
+ option to skip the linked scripts and still run texlinks.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* tl_scripts/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am
index 21d69bfdbc8..1797a8ee168 100644
--- a/Build/source/texk/texlive/Makefile.am
+++ b/Build/source/texk/texlive/Makefile.am
@@ -5,7 +5,10 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-SUBDIRS = tl_scripts linked_scripts
+SUBDIRS = tl_scripts
+if LINKED_SCRIPTS
+SUBDIRS += linked_scripts
+endif LINKED_SCRIPTS
## Windows wrapper sources.
##
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index 6a9db99ad5f..c3bbd1659d5 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -75,6 +75,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+@LINKED_SCRIPTS_TRUE@am__append_1 = linked_scripts
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
@@ -89,7 +90,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
- $(top_srcdir)/../../version.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/texlive.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -355,7 +357,7 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = tl_scripts linked_scripts
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -485,7 +487,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-SUBDIRS = tl_scripts linked_scripts
+SUBDIRS = tl_scripts $(am__append_1)
EXTRA_DIST = w32_wrapper $(TESTS)
TESTS = tests/updmap-cmdline-test.pl
all: all-recursive
diff --git a/Build/source/texk/texlive/ac/texlive.ac b/Build/source/texk/texlive/ac/texlive.ac
new file mode 100644
index 00000000000..07ffe2db813
--- /dev/null
+++ b/Build/source/texk/texlive/ac/texlive.ac
@@ -0,0 +1,11 @@
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+dnl
+dnl Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options for texlive
+m4_define_default([kpse_indent_26], [26])[]dnl
+AC_ARG_ENABLE([linked-scripts],
+ AS_HELP_STRING([--disable-linked-scripts],
+ [do not install the linked scripts],
+ kpse_indent_26))[]dnl
diff --git a/Build/source/texk/texlive/ac/withenable.ac b/Build/source/texk/texlive/ac/withenable.ac
index 82d635fb7ca..950c1b5083e 100644
--- a/Build/source/texk/texlive/ac/withenable.ac
+++ b/Build/source/texk/texlive/ac/withenable.ac
@@ -1,7 +1,8 @@
## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for texlive
KPSE_ENABLE_PROG([texlive], , , [TeX Live scripts])
+m4_include(kpse_TL[texk/texlive/ac/texlive.ac])
diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure
index f1383cb7c8f..7e79c74a2e1 100755
--- a/Build/source/texk/texlive/configure
+++ b/Build/source/texk/texlive/configure
@@ -611,6 +611,8 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+LINKED_SCRIPTS_FALSE
+LINKED_SCRIPTS_TRUE
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -684,6 +686,7 @@ ac_user_opts='
enable_option_checking
enable_silent_rules
enable_maintainer_mode
+enable_linked_scripts
enable_dependency_tracking
'
ac_precious_vars='build_alias
@@ -1314,6 +1317,8 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
+ --disable-linked-scripts
+ do not install the linked scripts
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
@@ -2432,6 +2437,23 @@ fi
+# Configure options for texlive also shown at the TeX Live top-level.
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options for texlive
+# Check whether --enable-linked-scripts was given.
+if test "${enable_linked_scripts+set}" = set; then :
+ enableval=$enable_linked_scripts;
+fi
+
+ if test "x$enable_linked_scripts" != xno; then
+ LINKED_SCRIPTS_TRUE=
+ LINKED_SCRIPTS_FALSE='#'
+else
+ LINKED_SCRIPTS_TRUE='#'
+ LINKED_SCRIPTS_FALSE=
+fi
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3749,6 +3771,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${LINKED_SCRIPTS_TRUE}" && test -z "${LINKED_SCRIPTS_FALSE}"; then
+ as_fn_error $? "conditional \"LINKED_SCRIPTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/Build/source/texk/texlive/configure.ac b/Build/source/texk/texlive/configure.ac
index c70779db465..be6b1e49e40 100644
--- a/Build/source/texk/texlive/configure.ac
+++ b/Build/source/texk/texlive/configure.ac
@@ -16,6 +16,10 @@ AC_CONFIG_MACRO_DIR([../../m4])
AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE
+# Configure options for texlive also shown at the TeX Live top-level.
+m4_include([ac/texlive.ac])
+AM_CONDITIONAL([LINKED_SCRIPTS], [test "x$enable_linked_scripts" != xno])
+
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 35442038ae8..5d87dade247 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -81,7 +81,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(nobase_dist_texmf_scripts_SCRIPTS) ChangeLog README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
- $(top_srcdir)/../../version.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/texlive.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index b47f9d5baa3..3ec23434080 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -87,7 +87,8 @@ DIST_COMMON = $(top_srcdir)/../../am/script_links.am \
subdir = tl_scripts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
- $(top_srcdir)/../../version.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/texlive.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d