diff options
author | Takuji Tanaka <KXD02663@nifty.ne.jp> | 2017-06-25 14:05:44 +0000 |
---|---|---|
committer | Takuji Tanaka <KXD02663@nifty.ne.jp> | 2017-06-25 14:05:44 +0000 |
commit | 401fb6075531460a865e403a2b50974a52b051ab (patch) | |
tree | 15dbee7b09abce6348f1a62c053d1eb3d9b83845 /Build/source | |
parent | 7f9a607a76c3e5a48fa3c527c3bcc61b71b5f71c (diff) |
texk/dvidvi: Better configuration for Windows & kpathsea
git-svn-id: svn://tug.org/texlive/trunk@44693 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/dvidvi/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvidvi/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/texk/dvidvi/configure | 61 | ||||
-rw-r--r-- | Build/source/texk/dvidvi/configure.ac | 1 |
4 files changed, 68 insertions, 0 deletions
diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog index 47efb910eb5..c03ca78c6d5 100644 --- a/Build/source/texk/dvidvi/ChangeLog +++ b/Build/source/texk/dvidvi/ChangeLog @@ -1,3 +1,8 @@ +2017-06-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * configure{,ac}, aclocal.m4: + Better configuration for Windows & kpathsea. + 2017-06-23 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * dvidvi.c, configure, Makefile.{am,in}: diff --git a/Build/source/texk/dvidvi/aclocal.m4 b/Build/source/texk/dvidvi/aclocal.m4 index b18167485a8..b582d50c036 100644 --- a/Build/source/texk/dvidvi/aclocal.m4 +++ b/Build/source/texk/dvidvi/aclocal.m4 @@ -1189,6 +1189,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/dvidvi/configure b/Build/source/texk/dvidvi/configure index 69760251358..55e3d58fb50 100755 --- a/Build/source/texk/dvidvi/configure +++ b/Build/source/texk/dvidvi/configure @@ -636,6 +636,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +WIN32_FALSE +WIN32_TRUE KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS @@ -14891,6 +14893,61 @@ fi KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +{ $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" @@ -15032,6 +15089,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/dvidvi/configure.ac b/Build/source/texk/dvidvi/configure.ac index 49e367012a7..5524d5cd0a7 100644 --- a/Build/source/texk/dvidvi/configure.ac +++ b/Build/source/texk/dvidvi/configure.ac @@ -19,6 +19,7 @@ AC_CONFIG_HEADERS([config.h]) # We don't use libpathsea, so add '-DNO_DEBUG' not to overload fopen. KPSE_KPATHSEA_FLAGS([no-debug]) +KPSE_COND_WIN32 AC_CONFIG_FILES([Makefile]) |