diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-26 12:32:29 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-26 12:32:29 +0000 |
commit | c00c8298eb6913b74270a36c1f1018f1e9946f7b (patch) | |
tree | 0626d89e0bf74a988ddca1422070ecc5d529f75a /Build/source/texk/dvisvgm | |
parent | 4b8ae4eaaafdf1d834cafb73275b51b1578f6f47 (diff) |
dvisvgm: Add configure option '--without-libgs'
git-svn-id: svn://tug.org/texlive/trunk@32488 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm')
-rw-r--r-- | Build/source/texk/dvisvgm/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/ac/dvisvgm.ac | 5 | ||||
-rwxr-xr-x | Build/source/texk/dvisvgm/configure | 22 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/configure.ac | 8 |
4 files changed, 32 insertions, 7 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 42cab1f1520..b8d989858ee 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ac/dvisvgm.ac, configure.ac: Add '--without-libgs'. + 2013-10-30 Peter Breitenlohner <peb@mppmu.mpg.de> * Imported release 1.5.1. diff --git a/Build/source/texk/dvisvgm/ac/dvisvgm.ac b/Build/source/texk/dvisvgm/ac/dvisvgm.ac index 3a8f958b649..2ddca5a1db7 100644 --- a/Build/source/texk/dvisvgm/ac/dvisvgm.ac +++ b/Build/source/texk/dvisvgm/ac/dvisvgm.ac @@ -1,9 +1,12 @@ ## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ 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 for dvisvgm +AC_ARG_WITH([libgs], + AS_HELP_STRING([--without-libgs], + [build dvisvgm without PostScript support])) AC_ARG_WITH([system-libgs], AS_HELP_STRING([--with-system-libgs], [build dvisvgm with installed gs headers and library diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 479c1b31145..4b0ab3c4da6 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -803,6 +803,7 @@ with_gnu_ld with_sysroot enable_libtool_lock enable_largefile +with_libgs with_system_libgs with_libgs_includes with_libgs_libdir @@ -1478,6 +1479,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --without-libgs build dvisvgm without PostScript support --with-system-libgs build dvisvgm with installed gs headers and library [default: no] --with-libgs-includes=DIR @@ -13195,6 +13197,12 @@ fi ## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ ## configure options for dvisvgm +# Check whether --with-libgs was given. +if test "${with_libgs+set}" = set; then : + withval=$with_libgs; +fi + + # Check whether --with-system-libgs was given. if test "${with_system_libgs+set}" = set; then : withval=$with_system_libgs; @@ -19287,7 +19295,10 @@ kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS -if test "x$with_system_libgs" = xyes; then +if test "x$with-libgs" = xno; then : + libgs_mode=no +else + if test "x$with_system_libgs" = xyes; then libgs_mode=link case $with_libgs_includes in #( "" | yes | no) : @@ -19434,13 +19445,16 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS - -$as_echo "#define DISABLE_GS 1" >>confdefs.h - LIBGS_LIBS= fi fi fi +fi +if test "x$libgs_mode" = xno; then + +$as_echo "#define DISABLE_GS 1" >>confdefs.h + +fi if test "x$libgs_mode" = xload; then diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index f61b91ce82e..9bb07ed41c3 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -51,6 +51,8 @@ KPSE_POTRACE_FLAGS KPSE_SAVE_FLAGS +AS_IF([test "x$with-libgs" = xno], [libgs_mode=no], + [dnl if test "x$with_system_libgs" = xyes; then libgs_mode=link AS_CASE([$with_libgs_includes], @@ -92,11 +94,13 @@ else if test "x$ac_cv_header_dlfcn_h:$ac_cv_func_dlopen" != xyes:yes; then libgs_mode=no KPSE_RESTORE_FLAGS - AC_DEFINE([DISABLE_GS], 1, - [Set to 1 if PostScript support should be disabled.]) LIBGS_LIBS= fi fi +fi]) +if test "x$libgs_mode" = xno; then + AC_DEFINE([DISABLE_GS], 1, + [Set to 1 if PostScript support should be disabled.]) fi AC_SUBST([LIBGS_INCLUDES]) AC_SUBST([LIBGS_LIBS]) |