From 51ebb9cb3b77f55e8f5b41f7a2dc12ca3d24f8a1 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 24 Apr 2009 15:19:37 +0000 Subject: new build system: towards completion git-svn-id: svn://tug.org/texlive/trunk@12813 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/configure | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) (limited to 'Build/source/libs') diff --git a/Build/source/libs/configure b/Build/source/libs/configure index f1b2ab33847..bf70dce517b 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -682,8 +682,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_all_pkgs -enable_cxx_runtime_hack +enable_native_texlive_build enable_multiplatform +enable_cxx_runtime_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1441,9 +1442,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-all-pkgs do not build packages unless explicitly enabled - --enable-cxx-runtime-hack link C++ runtime statically + --disable-native-texlive-build + do not build for the TeX Live binary distribution --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM + --enable-cxx-runtime-hack link C++ runtime statically --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2152,11 +2155,36 @@ if test "${enable_all_pkgs+set}" = set; then enableval=$enable_all_pkgs; fi test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes -# Check whether --enable-cxx-runtime-hack was given. -if test "${enable_cxx_runtime_hack+set}" = set; then - enableval=$enable_cxx_runtime_hack; -fi +# Check whether --enable-native-texlive-build was given. +if test "${enable_native_texlive_build+set}" = set; then + enableval=$enable_native_texlive_build; +fi +case $enable_native_texlive_build in + yes | no) : ;; + *) enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;; +esac + +if test "x$enable_native_texlive_build" = xyes; then + case $enable_multiplatform in + yes | no) : ;; + *) enable_multiplatform=yes + ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;; +esac + case $enable_cxx_runtime_hack in + yes | no) : ;; + *) enable_cxx_runtime_hack=yes + ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; +esac + + case $enable_shared in + yes | no) : ;; + *) enable_shared=no + ac_configure_args="$ac_configure_args '--disable-shared'" ;; +esac + +fi # Check whether --enable-multiplatform was given. if test "${enable_multiplatform+set}" = set; then enableval=$enable_multiplatform; @@ -2172,6 +2200,11 @@ if test "x$enable_multiplatform" = xyes; then fi fi +# Check whether --enable-cxx-runtime-hack was given. +if test "${enable_cxx_runtime_hack+set}" = set; then + enableval=$enable_cxx_runtime_hack; +fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level -- cgit v1.2.3