$NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $

--- configure.orig	2004-11-23 12:35:43.000000000 -0800
+++ configure
@@ -855,6 +855,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)
   --enable-localjpeg      use local JPEG library, default=auto
@@ -1377,7 +1379,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"
@@ -1478,6 +1495,20 @@ else
     LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
 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
 
 
 
@@ -9148,23 +9179,8 @@ esac
 
 
 
-case "$uname" in
-    *BSD* | Darwin*)
-	# *BSD
-	CAT1EXT=0
-	CAT3EXT=0
-	;;
-    IRIX*)
-	# SGI IRIX
-	CAT1EXT=z
-	CAT3EXT=z
-	;;
-    *)
-	# All others
-	CAT1EXT=1
-	CAT3EXT=3
-	;;
-esac
+CAT1EXT=1
+CAT3EXT=3
 
 
 
@@ -9230,7 +9246,7 @@ echo "${ECHO_T}yes" >&6
 	    ;;
     esac
 
-    CXX="$CC"
+#    CXX="$CC"
 
     # Show all standard warnings + unused variables, conversion errors,
     # and inlining problems when compiling...
@@ -10120,6 +10136,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t
 s,@IMGLIBNAME@,$IMGLIBNAME,;t t
 s,@LIBEXT@,$LIBEXT,;t t
 s,@LIBNAME@,$LIBNAME,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LINKFLTK@,$LINKFLTK,;t t
 s,@LINKFLTKGL@,$LINKFLTKGL,;t t
 s,@LINKFLTKIMG@,$LINKFLTKIMG,;t t