texlive[44693] Build/source/texk/dvidvi: texk/dvidvi: Better

commits+takuji at tug.org commits+takuji at tug.org
Sun Jun 25 16:05:45 CEST 2017


Revision: 44693
          http://tug.org/svn/texlive?view=revision&revision=44693
Author:   takuji
Date:     2017-06-25 16:05:44 +0200 (Sun, 25 Jun 2017)
Log Message:
-----------
texk/dvidvi: Better configuration for Windows & kpathsea

Modified Paths:
--------------
    trunk/Build/source/texk/dvidvi/ChangeLog
    trunk/Build/source/texk/dvidvi/aclocal.m4
    trunk/Build/source/texk/dvidvi/configure
    trunk/Build/source/texk/dvidvi/configure.ac

Modified: trunk/Build/source/texk/dvidvi/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvidvi/ChangeLog	2017-06-25 07:45:16 UTC (rev 44692)
+++ trunk/Build/source/texk/dvidvi/ChangeLog	2017-06-25 14:05:44 UTC (rev 44693)
@@ -1,3 +1,8 @@
+2017-06-25  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* configure{,ac}, aclocal.m4:
+	Better configuration for Windows & kpathsea.
+
 2017-06-23  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* dvidvi.c, configure, Makefile.{am,in}:

Modified: trunk/Build/source/texk/dvidvi/aclocal.m4
===================================================================
--- trunk/Build/source/texk/dvidvi/aclocal.m4	2017-06-25 07:45:16 UTC (rev 44692)
+++ trunk/Build/source/texk/dvidvi/aclocal.m4	2017-06-25 14:05:44 UTC (rev 44693)
@@ -1189,6 +1189,7 @@
 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])

Modified: trunk/Build/source/texk/dvidvi/configure
===================================================================
--- trunk/Build/source/texk/dvidvi/configure	2017-06-25 07:45:16 UTC (rev 44692)
+++ trunk/Build/source/texk/dvidvi/configure	2017-06-25 14:05:44 UTC (rev 44693)
@@ -636,6 +636,8 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+WIN32_FALSE
+WIN32_TRUE
 KPATHSEA_RULE
 KPATHSEA_DEPEND
 KPATHSEA_LIBS
@@ -14891,7 +14893,62 @@
 
 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 @@
   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

Modified: trunk/Build/source/texk/dvidvi/configure.ac
===================================================================
--- trunk/Build/source/texk/dvidvi/configure.ac	2017-06-25 07:45:16 UTC (rev 44692)
+++ trunk/Build/source/texk/dvidvi/configure.ac	2017-06-25 14:05:44 UTC (rev 44693)
@@ -19,6 +19,7 @@
 
 # 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])
 



More information about the tex-live-commits mailing list