$NetBSD: patch-ab,v 1.11 2006/01/22 11:11:34 wiz Exp $ --- configure.in.orig 2006-01-15 18:36:16.000000000 +0000 +++ configure.in @@ -96,6 +96,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) @@ -112,6 +113,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="" @@ -222,6 +232,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(DSOLINK) @@ -757,26 +782,9 @@ AC_SUBST(INSTALL_DESKTOP) AC_SUBST(UNINSTALL_DESKTOP) dnl Figure out the appropriate formatted man page extension... -case "$uname" in - *BSD* | Darwin*) - # *BSD - CAT1EXT=0 - CAT3EXT=0 - CAT6EXT=0 - ;; - IRIX*) - # SGI IRIX - CAT1EXT=z - CAT3EXT=z - CAT6EXT=z - ;; - *) - # All others - CAT1EXT=1 - CAT3EXT=3 - CAT6EXT=3 - ;; -esac + CAT1EXT=1 + CAT3EXT=3 + CAT6EXT=6 AC_SUBST(CAT1EXT) AC_SUBST(CAT3EXT)