diff options
Diffstat (limited to 'Build/source/texk/dviljk')
| -rw-r--r-- | Build/source/texk/dviljk/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/Makefile.in | 9 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | Build/source/texk/dviljk/configure | 61 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/configure.ac | 5 |
6 files changed, 79 insertions, 5 deletions
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index 1e0dd590238..450697d8fbb 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/ChangeLog @@ -1,3 +1,7 @@ +2010-12-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, configure.ac: Ignore shell script for WIN32. + 2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de> * dvi2xx.c (mkdtemp): Declare as static. [WIN32] Define mkdir diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am index fe51fb1c5b2..3aa4107d5fc 100644 --- a/Build/source/texk/dviljk/Makefile.am +++ b/Build/source/texk/dviljk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dviljk/ ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -17,7 +17,9 @@ libdvilj_a_SOURCES = \ $(libdvilj_a_OBJECTS): $(KPATHSEA_DEPEND) +if !WIN32 dist_bin_SCRIPTS = dvihp +endif !WIN32 bin_PROGRAMS = dvilj dvilj2p dvilj4 dvilj4l diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index a61f7e06d17..2f1c8365262 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/Makefile.in @@ -39,8 +39,9 @@ host_triplet = @host@ bin_PROGRAMS = dvilj$(EXEEXT) dvilj2p$(EXEEXT) dvilj4$(EXEEXT) \ dvilj4l$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \ - $(dist_man1_MANS) $(srcdir)/../../build-aux/config.guess \ +DIST_COMMON = README $(am__configure_deps) \ + $(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \ + $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ @@ -56,6 +57,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -96,6 +98,7 @@ am_dvilj4l_OBJECTS = dvilj4l-dvi2xx.$(OBJEXT) dvilj4l_OBJECTS = $(am_dvilj4l_OBJECTS) dvilj4l_LDADD = $(LDADD) dvilj4l_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1) +am__dist_bin_SCRIPTS_DIST = dvihp am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -279,7 +282,7 @@ libdvilj_a_SOURCES = \ tfm.c \ tfm.h -dist_bin_SCRIPTS = dvihp +@WIN32_FALSE@dist_bin_SCRIPTS = dvihp dvilj_CPPFLAGS = -DKPATHSEA -DLJ dvilj_SOURCES = \ commands.h \ diff --git a/Build/source/texk/dviljk/aclocal.m4 b/Build/source/texk/dviljk/aclocal.m4 index d77f3a9c0b1..2e8f28004fa 100644 --- a/Build/source/texk/dviljk/aclocal.m4 +++ b/Build/source/texk/dviljk/aclocal.m4 @@ -992,6 +992,7 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-warnings.m4]) +m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/libtool.m4]) m4_include([../../m4/ltoptions.m4]) m4_include([../../m4/ltsugar.m4]) diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure index 25617427d5f..4f5f433d3e2 100755 --- a/Build/source/texk/dviljk/configure +++ b/Build/source/texk/dviljk/configure @@ -616,6 +616,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +WIN32_FALSE +WIN32_TRUE KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS @@ -14264,6 +14266,61 @@ if test "x$kpse_cv_kpse_debug" != xyes; then : fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 +$as_echo_n "checking for native WIN32 or MINGW32... " >&6; } +if ${kpse_cv_have_win32+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef WIN32 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __MINGW32__ + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win32=mingw32 +else + kpse_cv_have_win32=native +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + kpse_cv_have_win32=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 +$as_echo "$kpse_cv_have_win32" >&6; } + + if test "x$kpse_cv_have_win32" != xno; then + WIN32_TRUE= + WIN32_FALSE='#' +else + WIN32_TRUE='#' + WIN32_FALSE= +fi + + ac_config_files="$ac_config_files Makefile" @@ -14396,6 +14453,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then + as_fn_error $? "conditional \"WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/Build/source/texk/dviljk/configure.ac b/Build/source/texk/dviljk/configure.ac index 737a4cce060..b66404381ea 100644 --- a/Build/source/texk/dviljk/configure.ac +++ b/Build/source/texk/dviljk/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -23,6 +23,9 @@ AC_CHECK_FUNCS([rmdir unlink mkdtemp mktemp]) KPSE_KPATHSEA_FLAGS +KPSE_CHECK_WIN32 +AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT |