diff options
Diffstat (limited to 'Build/source/texk/xdvik/configure.in')
-rw-r--r-- | Build/source/texk/xdvik/configure.in | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/Build/source/texk/xdvik/configure.in b/Build/source/texk/xdvik/configure.in index d17c977cb9f..4925e9c1f30 100644 --- a/Build/source/texk/xdvik/configure.in +++ b/Build/source/texk/xdvik/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(xdvi.c) AC_PREREQ(2.59) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) +AC_CONFIG_HEADER([c-auto.h:c-auto.in], [date >stamp-auto]) AC_PROG_CC AC_PROG_INSTALL @@ -15,6 +15,28 @@ dnl allow for --program-suffix AC_ARG_PROGRAM sinclude(../kpathsea/withenable.ac) +sinclude(../../withenable.ac) +sinclude(kpathsea.ac) + +if test "x$with_mktexpk_default" = "xno"; then + AC_MSG_WARN(Xdvik doesn't implement the --without-mktexpk-default option!) +fi + +if test "x$with_mktexmf_default" = "xno"; then + AC_MSG_WARN(Xdvik doesn't implement the --without-mktexmf-default option!) +fi + +if test "x$with_mktextfm_default" = "xno"; then + AC_MSG_WARN(Xdvik doesn't implement the --without-mktextfm-default option!) +fi + +if test "x$with_mkocp_default" = "xno"; then + AC_MSG_WARN(Xdvik doesn't implement the --without-mkocp-default option!) +fi + +if test "x$with_mkofm_default" = "xno"; then + AC_MSG_WARN(Xdvik doesn't implement the --without-mkofm-default option!) +fi AC_FUNC_VFORK AC_FUNC_VPRINTF @@ -50,8 +72,7 @@ COMPILER_WARNINGS dnl SU: for `--allow-multiple-definition' linker flag on Cygwin XDVI_LINKER_MULTIPLE_DEFNS -AC_CHECK_HEADERS(stdint.h) - +AC_CHECK_HEADERS(stdint.h inttypes.h) AC_CHECK_TYPE(uint32_t, unsigned long) dnl These were probably missing from the test-set? @@ -70,17 +91,15 @@ AC_CHECK_HEADERS(netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_CHECK_HEADERS(X11/Xosdefs.h X11/xpm.h Xm/XpmP.h) +AC_CHECK_HEADERS(X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.h) CPPFLAGS=$cppflags_save dnl For editres, we need to check both the header and define a linker option. cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -dnl The fourth argument below is ignored by autoconf-2.13, -dnl but is required by autoconf-2.59 -AC_CHECK_HEADERS(X11/Intrinsic.h) AC_CHECK_HEADERS(X11/Xmu/Editres.h X11/Xmu/Xmu.h, x_xmu_lib=-lXmu, x_xmu_lib=, -[#ifdef HAVE_X11_INTRINSIC_H +[ +#ifdef HAVE_X11_INTRINSIC_H # include <X11/Intrinsic.h> #endif ]) @@ -214,11 +233,13 @@ dnl backtick magic inside other commands. dnl dnl For some reason, the doubling of $$ and \\ must be reverted here: my_program_transform_name=`echo $program_transform_name | sed 's,\\$\\$,$,g' | sed 's,\\\\\\\\,\\\\,g'` -exec_name="xdvi-$prog_extension.bin" +exec_name="xdvi-$prog_extension" final_exec_name=`echo $exec_name | sed "$my_program_transform_name"` +dnl OBSOLETE?? exec_link=`echo xdvi.bin | sed "$my_program_transform_name"` wrapper_script=`echo xdvi | sed "$my_program_transform_name"` AC_SUBST(exec_name) AC_SUBST(final_exec_name) +dnl OBSOLETE?? AC_SUBST(exec_link) AC_SUBST(wrapper_script) dnl @@ -253,13 +274,13 @@ elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps" fi -XDVI_ARG_STRING(default-dvips-path, +XDVI_ARG_STRING([default-dvips-path], [ --with-default-dvips-path=CMD Use CMD as default DVI to PS converter], [DEFAULT_DVIPS_PATH], ["dvips"], [Define to point to the default command to use for printing (optional).]) -XDVI_ARG_STRING(default-ps2pdf-path, +XDVI_ARG_STRING([default-ps2pdf-path], [ --with-default-ps2pdf-path=CMD Use CMD as default PS to PDF converter], [DEFAULT_PS2PDF_PATH], ["ps2pdf"], @@ -285,6 +306,6 @@ KPSE_CROSS_BUILD_VAR(CPPFLAGS, $(BUILDXCPPFLAGS)) KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS)) KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC)) -KPSE_CONFIG_FILES([Makefile gui/Makefile]) +KPSE_CONFIG_FILES([Makefile gui/Makefile tests/Makefile]) AC_CONFIG_FILES([xdvi-sh]) AC_OUTPUT |