$NetBSD: patch-ab,v 1.14 2022/07/27 18:42:42 wiz Exp $

--- configure.in.orig	2009-09-20 17:25:25.000000000 +0000
+++ configure.in
@@ -122,6 +122,7 @@ AC_SUBST(GLLIBNAME)
 AC_SUBST(IMGLIBNAME)
 AC_SUBST(LIBEXT)
 AC_SUBST(LIBNAME)
+AC_SUBST(LIBTOOL)
 AC_SUBST(LINKFLTK)
 AC_SUBST(LINKFLTKFORMS)
 AC_SUBST(LINKFLTKGL)
@@ -143,6 +144,15 @@ fi
 AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [default=yes]])
 
 AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]])
+AC_ARG_ENABLE(libtool, [  --enable-libtool=LIBTOOL_PATH
+                          turn on building with libtool [default=no]],[
+if eval "test x$enable_libtool != xno"; then
+    LIBTOOL="$enable_libtool"
+    enable_shared=no
+else
+    LIBTOOL=""
+fi])
+
 if test x$enable_shared = xyes; then
     PICFLAG=1
     SHAREDSUFFIX=""
@@ -261,6 +271,21 @@ else
     FLUID="fluid"
     LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
 fi
+if test "x$LIBTOOL" != "x"; then
+    LINKFLTK="../src/libfltk.la"
+    if test "x$LINKFLTKGL" != "x"; then    
+        LINKFLTKGL="../src/libfltk_gl.la"    
+    fi    
+    if test "x$LINKFLTKIMG" != "x"; then    
+        LINKFLTKIMG="../src/libfltk_images.la"    
+    fi
+    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
+    DSONAME="libfltk.la"
+    FLDSONAME="libfltk_forms.la"
+    GLDSONAME="libfltk_gl.la"
+    IMGDSONAME="libfltk_images.la"
+fi
+
 
 AC_SUBST(DSOCOMMAND)
 AC_SUBST(DSOFLAGS)
@@ -611,7 +636,7 @@ AC_ARG_ENABLE(localpng, [  --enable-loca
 syspnglib_ok=no
 syspnginc_ok=no
 if test x$enable_localpng != xyes; then
-  AC_CHECK_LIB(png, png_read_info, 
+  AC_CHECK_LIB(png16, png_read_info, 
     [AC_CHECK_HEADER(png.h, 
 	AC_DEFINE(HAVE_PNG_H)
 	syspnginc_ok=yes)
@@ -640,11 +665,11 @@ if test x$enable_localpng = xyes -o x$sy
 else
     PNGINC=""
     PNG=""
-    IMAGELIBS="-lpng $IMAGELIBS"
-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
+    IMAGELIBS="-lpng16 $IMAGELIBS"
+    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
     AC_DEFINE(HAVE_LIBPNG)
-    AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
-    AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
+    AC_CHECK_LIB(png16,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
+    AC_CHECK_LIB(png16,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
 fi
 
 AC_SUBST(JPEG)