$NetBSD: patch-ac,v 1.12 2022/07/27 18:42:42 wiz Exp $

--- configure.orig	2009-12-27 15:24:34.000000000 +0000
+++ configure
@@ -1323,6 +1323,8 @@ Optional Features:
   --enable-debug          turn on debugging default=no
   --enable-gl             turn on OpenGL support default=yes
   --enable-shared         turn on shared libraries default=no
+  --enable-libtool=LIBTOOL_PATH
+                          turn on building with libtool [default=no]
   --enable-threads        enable multi-threading support
   --enable-quartz         use Quartz instead of Quickdraw (default=no)
   --disable-largefile     omit support for large files
@@ -1898,7 +1900,22 @@ if test "${enable_shared+set}" = set; th
   enableval=$enable_shared;
 fi
 
-if test x$enable_shared = xyes; then
+
+# Check whether --enable-libtool or --disable-libtool was given.
+if test "${enable_libtool+set}" = set; then
+  enableval="$enable_libtool"
+
+if test x$enable_libtool != xno; then
+    LIBTOOL="$enable_libtool"
+    enable_shared=no
+else
+    LIBTOOL=""
+fi
+fi
+
+
+if test "$enable_shared" = "yes"; then
+
     PICFLAG=1
     SHAREDSUFFIX=""
     FLUID="fluid-shared"
@@ -2018,8 +2035,20 @@ else
     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
 
 
 
@@ -8794,13 +8823,13 @@ fi
 syspnglib_ok=no
 syspnginc_ok=no
 if test x$enable_localpng != xyes; then
-  { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
-echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for png_read_info in -lpng16" >&5
+echo $ECHO_N "checking for png_read_info in -lpng16... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_read_info+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng  $LIBS"
+LIBS="-lpng16  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9161,19 +9190,19 @@ echo "$as_me: WARNING: Cannot find syste
 else
     PNGINC=""
     PNG=""
-    IMAGELIBS="-lpng $IMAGELIBS"
-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
+    IMAGELIBS="-lpng16 $IMAGELIBS"
+    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBPNG 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: checking for png_get_valid in -lpng" >&5
-echo $ECHO_N "checking for png_get_valid in -lpng... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: checking for png_get_valid in -lpng16" >&5
+echo $ECHO_N "checking for png_get_valid in -lpng16... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_get_valid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng  $LIBS"
+LIBS="-lpng16  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9235,13 +9264,13 @@ _ACEOF
 
 fi
 
-    { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng" >&5
-echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng16" >&5
+echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng16... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_set_tRNS_to_alpha+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng  $LIBS"
+LIBS="-lpng16  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF