[tlbuild] asymptote-2.56 in tl sources

[Ken Brown]

On 10/6/2019 4:04 PM, Karl Berry wrote:
> John (Bowman) has made more efforts to ease the asymptote build. The
> current release (2.56) is in the TeX Live source tree now. If you have a
> chance, please try it. (But don't commit new binaries anywhere -- we
> won't update the released TL until next year.) --thanks, karl.

John,

Commit 05f68ab80e7caa521c967b32ba672fa58bcaae3c in the asymptote git repo 
changed the Cygwin build to use the Win32 API instead of the POSIX API.  I 
assume this was done for builds that use Cygwin as a tool for building an 
MS-Windows asymptote, but it breaks the ordinary Cygwin build (both for the 
Cygwin distribution and for native TeX Live).

Can you make the two builds co-exist again?  I was able to do the ordinary 
Cygwin build by using the attached patch, but it probably breaks the other use case.

Ken
-------------- next part --------------
diff --git a/configure.ac b/configure.ac
index 02092c84..5842d957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ AC_ARG_ENABLE(gc-full-debug,
 
 INCL=$INCL" -I/usr/include/tirpc"
 
-if test "$OSTYPE" = "cygwin"; then
+if test "$OSTYPE" = "msdos"; then
 CPPFLAGS=$CPPFLAGS" -D__MSDOS__ -I/usr/include/w32api -I/usr/include -DCALLBACK=__stdcall $INCL"
 else
 CPPFLAGS=$CPPFLAGS" $INCL"
@@ -384,7 +384,7 @@ if test "x$enable_openimageio" = "xyes"; then
 fi
 
 case "$OSTYPE" in
-     cygwin)
+     msdos)
               AC_CHECK_LIB([gccpp],[GC_throw_bad_alloc])
               AC_CHECK_HEADER(GL/glut.h,
                                   [AC_DEFINE(HAVE_LIBGLUT,1,
@@ -407,6 +407,16 @@ case "$OSTYPE" in
                            LIBS=$LIBS"-framework GLUT -framework OpenGL -framework Cocoa glew.o "],
                                  AC_MSG_NOTICE([*** Could not find GLUT: will compile without OpenGLLUT support ***]))
         ;;
+     cygwin)
+          AC_CHECK_LIB([gccpp],[GC_throw_bad_alloc])
+          AC_CHECK_LIB([glut], [glutMainLoop],,
+                       AC_MSG_NOTICE([*** Could not find libglut: will compile without OpenGL support ***]))
+          AC_CHECK_LIB([GL], [glDepthMask])
+          AC_CHECK_HEADER(GL/glew.h, [AC_DEFINE(HAVE_LIBGLEW, 1,
+               DEFINE_LIB[GLEW])
+               LIBS="-lGLEW "$LIBS],
+                     AC_MSG_NOTICE([*** Could not find libGLEW: will compile without OpenGL support ***]))
+        ;;
      *)
          AC_CHECK_LIB([gccpp],[GC_throw_bad_alloc])
           AC_CHECK_LIB([glut], [glutMainLoop],,