xdvik 22.86

git-svn-id: svn://tug.org/texlive/trunk@29732 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 260 insertions, 49 deletions

diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index ba737fb566d..95cb39f6711 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xdvik 22.85.
+# Generated by GNU Autoconf 2.69 for xdvik 22.86.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xdvik'
 PACKAGE_TARNAME='xdvik'
-PACKAGE_VERSION='22.85'
-PACKAGE_STRING='xdvik 22.85'
+PACKAGE_VERSION='22.86'
+PACKAGE_STRING='xdvik 22.86'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -638,10 +638,15 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 subdirs
 XDVIK_VERSION
-T1LIB_RULE
-T1LIB_DEPEND
-T1LIB_LIBS
-T1LIB_INCLUDES
+FREETYPE2_RULE
+FREETYPE2_DEPEND
+FREETYPE2_LIBS
+FREETYPE2_INCLUDES
+FT2_CONFIG
+ZLIB_RULE
+ZLIB_DEPEND
+ZLIB_LIBS
+ZLIB_INCLUDES
 KPATHSEA_RULE
 KPATHSEA_DEPEND
 KPATHSEA_LIBS
@@ -811,9 +816,11 @@ with_motif_libdir
 with_system_kpathsea
 with_kpathsea_includes
 with_kpathsea_libdir
-with_system_t1lib
-with_t1lib_includes
-with_t1lib_libdir
+with_system_zlib
+with_zlib_includes
+with_zlib_libdir
+with_system_freetype2
+with_default_gs_lib_path
 with_default_dvips_path
 with_default_ps2pdf_path
 '
@@ -1367,7 +1374,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xdvik 22.85 to adapt to many kinds of systems.
+\`configure' configures xdvik 22.86 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1441,7 +1448,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdvik 22.85:";;
+     short | recursive ) echo "Configuration of xdvik 22.86:";;
    esac
   cat <<\_ACEOF
 
@@ -1502,10 +1509,14 @@ Optional Packages:
                           kpathsea headers installed in DIR
   --with-kpathsea-libdir=DIR
                           kpathsea library installed in DIR
-  --with-system-t1lib     use installed t1lib headers and library
-  --with-t1lib-includes=DIR
-                          t1lib headers installed in DIR
-  --with-t1lib-libdir=DIR t1lib library installed in DIR
+  --with-system-zlib      use installed zlib headers and library
+  --with-zlib-includes=DIR
+                          zlib headers installed in DIR
+  --with-zlib-libdir=DIR  zlib library installed in DIR
+  --with-system-freetype2 use installed freetype2 headers and library
+                          (requires freetype-config)
+  --with-default-gs-lib-path=PATH
+                          set default path for finding font aliases to PATH
   --with-default-dvips-path=CMD
                           Use CMD as default DVI to PS converter
   --with-default-ps2pdf-path=CMD
@@ -1588,7 +1599,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xdvik configure 22.85
+xdvik configure 22.86
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2381,7 +2392,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xdvik $as_me 22.85, which was
+It was created by xdvik $as_me 22.86, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7812,7 +7823,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdvik'
- VERSION='22.85'
+ VERSION='22.86'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13172,7 +13183,7 @@ $as_echo "#define COLOR 1" >>confdefs.h
 
 
 
-$as_echo "#define T1LIB 1" >>confdefs.h
+$as_echo "#define FREETYPE 1" >>confdefs.h
 
 
 
@@ -15104,6 +15115,48 @@ done
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XKB Bell extension" >&5
+$as_echo_n "checking for XKB Bell extension... " >&6; }
+if ${xdvi_cv_func_xkb_bell+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  xdvi_save_LIBS=$LIBS
+LIBS="$X_PRE_LIBS"" $LIBS $X_LIBS -lX11"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <X11/X.h>
+#include <X11/XKBlib.h>		/* has the prototype */
+
+int
+main ()
+{
+
+	Atom y;
+	XkbBell((Display *)0, (Window)0, 0, y);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  xdvi_cv_func_xkb_bell=yes
+else
+  xdvi_cv_func_xkb_bell=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$xdvi_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdvi_cv_func_xkb_bell" >&5
+$as_echo "$xdvi_cv_func_xkb_bell" >&6; }
+if test "$xdvi_cv_func_xkb_bell" = yes; then
+  X_PRE_LIBS="$X_PRE_LIBS"
+
+$as_echo "#define HAVE_XKB_BELL_EXT 1" >>confdefs.h
+
+fi
+
 
 
 
@@ -15856,7 +15909,7 @@ fi
 # Check for libXp.
 # Although libXp is now defunct (no longer part of XOrg), older versions
 # of libXm may need to link with libXp; same for the equally defunct libXaw8.
-# We certainly don't want to include libXp unless necessay, since this might
+# We certainly don't want to include libXp unless necessary, since this might
 # only perpetuate the need to keep libXp.so around.
 # Moreover for ELF shared libraries a requirement for libXp.so is probably
 # encoded into libXm.so and/or libXaw.so and need not be specified explicitly.
@@ -16967,7 +17020,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-xdvik config.lt 22.85
+xdvik config.lt 22.86
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -18012,39 +18065,197 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup t1lib (-lt1) flags
+## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+
+# Check whether --with-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then :
+  withval=$with_system_zlib;
+fi
+
+# Check whether --with-zlib-includes was given.
+if test "${with_zlib_includes+set}" = set; then :
+  withval=$with_zlib_includes;
+fi
+
+# Check whether --with-zlib-libdir was given.
+if test "${with_zlib_libdir+set}" = set; then :
+  withval=$with_zlib_libdir;
+fi
+if test "x$with_system_zlib" = xyes; then
+  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ZLIB_INCLUDES="-I$with_zlib_includes"
+fi
+ZLIB_LIBS="-lz"
+if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then
+  ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS"
+fi
+else
+  ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include"
+  ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a"
+  ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a'
+  ZLIB_RULE='# Rebuild libz
+$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h
+	cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/zlib/include/zconf.h:
+	cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+
+## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+
+# Check whether --with-system-freetype2 was given.
+if test "${with_system_freetype2+set}" = set; then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = xyes; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_FT2_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FT2_CONFIG"; then
+  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 
-# Check whether --with-system-t1lib was given.
-if test "${with_system_t1lib+set}" = set; then :
-  withval=$with_system_t1lib;
 fi
+if test -z "$ac_cv_prog_FT2_CONFIG"; then
+  ac_ct_FT2_CONFIG=$FT2_CONFIG
+  # Extract the first word of "freetype-config", so it can be a program name with args.
+set dummy freetype-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_FT2_CONFIG"; then
+  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-# Check whether --with-t1lib-includes was given.
-if test "${with_t1lib_includes+set}" = set; then :
-  withval=$with_t1lib_includes;
+fi
+fi
+ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-# Check whether --with-t1lib-libdir was given.
-if test "${with_t1lib_libdir+set}" = set; then :
-  withval=$with_t1lib_libdir;
+  if test "x$ac_ct_FT2_CONFIG" = x; then
+    FT2_CONFIG="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FT2_CONFIG=$ac_ct_FT2_CONFIG
+  fi
+else
+  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 fi
-if test "x$with_system_t1lib" = xyes; then
-  if test "x$with_t1lib_includes" != x && test "x$with_t1lib_includes" != xyes; then
-  T1LIB_INCLUDES="-I$with_t1lib_includes"
+if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
-T1LIB_LIBS="-lt1"
-if test "x$with_t1lib_libdir" != x && test "x$with_t1lib_libdir" != xyes; then
-  T1LIB_LIBS="-L$with_t1lib_libdir $T1LIB_LIBS"
+else
+  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
+  FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
+  FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+  FREETYPE2_RULE='# Rebuild libfreetype
+$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
+	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/freetype2/ft2build.h:
+	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
+
+
+
+# Check whether --with-default-gs-lib-path was given.
+if test "${with_default_gs_lib_path+set}" = set; then :
+  withval=$with_default_gs_lib_path;
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_GS_LIB_PATH "$withval"
+_ACEOF
+
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the path to be used for Ghostscript searches" >&5
+$as_echo_n "checking for the path to be used for Ghostscript searches... " >&6; }
+if ${xdvi_cv_gs_lib_path+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  T1LIB_INCLUDES="-I$kpse_BLD/libs/t1lib"
-  T1LIB_LIBS="$kpse_BLD/libs/t1lib/libt1.a"
-  T1LIB_DEPEND='${top_builddir}/../../libs/t1lib/libt1.a'
-  T1LIB_RULE='# Rebuild libt1
-$(T1LIB_DEPEND): ${top_builddir}/../../libs/t1lib/t1lib.h
-	cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/t1lib/t1lib.h:
-	cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+  if gs -h >/dev/null 2>&1; then
+  ac_tmp="`gs -h \
+    | sed \
+      -e '1,/Search path:/d' \
+      -e '/For more information/,$d' \
+      -e '/Initialization files are compiled/d' \
+      -e 's/$/\/\/\//' \
+      -e 's/^   //' \
+    | tr '\n' '/'`"
+  # Solaris 9 sed doesn't handle incomplete lines at eof
+  xdvi_cv_gs_lib_path=`echo "$ac_tmp" \
+    | sed -e 's/\/\/\/\// /g' -e 's/ *$//' -e 's/ : /:/g'`
+else
+  xdvi_cv_gs_lib_path=/usr/local/share/ghostscript/fonts:/usr/local/lib/ghostscript/fonts:/usr/share/ghostscript/fonts:/var/lib/ghostscript/fonts:/usr/share/cups/fonts:/usr/share/fonts
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine Ghostscript search path; using $xdvi_cv_gs_lib_path" >&5
+$as_echo "$as_me: WARNING: Could not determine Ghostscript search path; using $xdvi_cv_gs_lib_path" >&2;}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdvi_cv_gs_lib_path" >&5
+$as_echo "$xdvi_cv_gs_lib_path" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_GS_LIB_PATH "$xdvi_cv_gs_lib_path"
+_ACEOF
+
+
 fi
 
 
@@ -18128,7 +18339,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-XDVIK_VERSION=22.85
+XDVIK_VERSION=22.86
 
 
 
@@ -18679,7 +18890,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xdvik $as_me 22.85, which was
+This file was extended by xdvik $as_me 22.86, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18745,7 +18956,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xdvik config.status 22.85
+xdvik config.status 22.86
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"