$NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $ --- configure.in.orig Mon May 7 10:34:22 2001 +++ configure.in @@ -30,6 +30,9 @@ AC_PROG_RANLIB LIBNAME="libfltk.a" +LIBRARY="../lib/\$(LIBNAME)" +LIBFLTK="../lib/\$(LIBNAME)" +LINKFLTK="-L../lib -lfltk" if test "$RANLIB" != ":"; then LIBCOMMAND="ar cr" else @@ -58,8 +61,17 @@ DEBUGFLAG="-g " 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]],[ -if eval "test x$enable_shared = xyes"; then +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 "$enable_shared" = "yes"; then PICFLAG=1 case $uname in SunOS* | UNIX_S*) @@ -95,7 +107,14 @@ DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o" ;; esac -fi]) +fi + +if test "x$LIBTOOL" != "x"; then + LIBNAME="libfltk.la" + LIBRARY="\$(LIBNAME)" + LIBFLTK="../src/\$(LIBNAME)" + LINKFLTK="../src/\$(LIBNAME)" +fi AC_PROG_CC AC_PROG_CXX @@ -375,7 +394,11 @@ AC_SUBST(DSONAME) AC_SUBST(DSOCOMMAND) AC_SUBST(LIBNAME) +AC_SUBST(LIBRARY) +AC_SUBST(LIBFLTK) +AC_SUBST(LINKFLTK) AC_SUBST(LIBCOMMAND) +AC_SUBST(LIBTOOL) AC_SUBST(MAKEDEPEND) AC_CONFIG_HEADER(config.h:configh.in) AC_OUTPUT(makeinclude)