diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
commit | b77e78eaf3652b80e78ae80f770bd3bdf721363d (patch) | |
tree | d3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build/source/texk/dvipng | |
parent | ad04e2284cbf8d1a4b268636c7451f89d29c4d0a (diff) |
new build system: mode texk/xdvik and general update
git-svn-id: svn://tug.org/texlive/trunk@12771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r-- | Build/source/texk/dvipng/ac/dvipng.ac | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipng/ac/withenable.ac | 6 | ||||
-rwxr-xr-x | Build/source/texk/dvipng/configure | 40 | ||||
-rw-r--r-- | Build/source/texk/dvipng/configure.ac | 8 |
4 files changed, 53 insertions, 7 deletions
diff --git a/Build/source/texk/dvipng/ac/dvipng.ac b/Build/source/texk/dvipng/ac/dvipng.ac index b1b8c1ac0a7..27d4bf31525 100644 --- a/Build/source/texk/dvipng/ac/dvipng.ac +++ b/Build/source/texk/dvipng/ac/dvipng.ac @@ -1,4 +1,8 @@ -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options for dvipng m4_define_default([kpse_indent_26], [26])[]dnl AC_ARG_ENABLE([debug], diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac index 7dd79a2f509..102fcee7cf4 100644 --- a/Build/source/texk/dvipng/ac/withenable.ac +++ b/Build/source/texk/dvipng/ac/withenable.ac @@ -1,4 +1,8 @@ -## texk/dvipng/ac/withenable.ac +## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ +dnl +dnl Copyright (C) 2009 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 dvipng KPSE_WITH_PROG([dvipng], [kpathsea freetype2 gd t1lib]) m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac]) diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index c3e450ff5f0..e4f5a7ec9cc 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -12902,7 +12902,7 @@ _ACEOF fi -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options for dvipng # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then @@ -18391,12 +18391,21 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use libpng" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use libpng" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use libpng" >&5 $as_echo "$as_me: error: cannot find/use libpng" >&2;} { (exit 1); exit 1; }; } fi +fi + + CPPFLAGS="$CPPFLAGS $GD_INCLUDES" LIBS="$GD_LIBS $LIBS" @@ -18492,6 +18501,14 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use libgd +This drawing library can be downloaded at http://www.boutell.com/gd" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use libgd +This drawing library can be downloaded at http://www.boutell.com/gd" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use libgd This drawing library can be downloaded at http://www.boutell.com/gd" >&5 $as_echo "$as_me: error: cannot find/use libgd @@ -18500,6 +18517,9 @@ This drawing library can be downloaded at http://www.boutell.com/gd" >&2;} fi +fi + + CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" LIBS="$KPATHSEA_LIBS $LIBS" @@ -18595,12 +18615,21 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use libkpathsea" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use libkpathsea" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use libkpathsea" >&5 $as_echo "$as_me: error: cannot find/use libkpathsea" >&2;} { (exit 1); exit 1; }; } fi +fi + + { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } if test "${kpse_cv_have_opentype_format+set}" = set; then @@ -19037,11 +19066,20 @@ as_val=`eval 'as_val=${'$as_ac_Header'} _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use $ac_header" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use $ac_header" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use $ac_header" >&5 $as_echo "$as_me: error: cannot find/use $ac_header" >&2;} { (exit 1); exit 1; }; } fi + +fi + done diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 724086829f5..44d552c2970 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -115,20 +115,20 @@ KPSE_ADD_FLAGS([libpng]) AC_CHECK_FUNC([png_read_image], [AC_DEFINE([HAVE_LIBPNG], 1, [Define to 1 if you have the `png' library (-lpng).])], - [AC_MSG_ERROR([cannot find/use libpng])]) + [KPSE_MSG_ERROR([dvipng], [cannot find/use libpng])]) KPSE_ADD_FLAGS([gd]) AC_CHECK_FUNC([gdImageCreate], [AC_DEFINE([HAVE_LIBGD], 1, [Define to 1 if you have the `gd' library (-lgd).])], - [AC_MSG_ERROR([cannot find/use libgd + [KPSE_MSG_ERROR([dvipng], [cannot find/use libgd This drawing library can be downloaded at http://www.boutell.com/gd])]) KPSE_ADD_FLAGS([kpathsea]) AC_CHECK_FUNC([kpse_set_progname], [AC_DEFINE([HAVE_LIBKPATHSEA], 1, [Define to 1 if you have the `kpathsea' library (-lkpathsea).])], - [AC_MSG_ERROR([cannot find/use libkpathsea])]) + [KPSE_MSG_ERROR([dvipng], [cannot find/use libkpathsea])]) dnl We need enc, cmap, and sfd formats. dnl Introduced together with opentype format (Dec 2003). @@ -154,7 +154,7 @@ AM_CONDITIONAL([have_ft2_or_t1], [test "x$have_ft2_or_t1" = xyes]) dnl Checks for more header files. AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h], , - [AC_MSG_ERROR([cannot find/use $ac_header])]) + [KPSE_MSG_ERROR([dvipng], [cannot find/use $ac_header])]) AC_CHECK_HEADERS([t1lib.h]) dnl Checks for library functions. |