$NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $ --- configure.orig Mon May 7 10:53:14 2001 +++ configure @@ -18,6 +18,9 @@ ac_help="$ac_help --enable-shared turn on shared libraries [default=no]" ac_help="$ac_help + --enable-libtool=LIBTOOL_PATH + turn on building with libtool [default=no]" +ac_help="$ac_help --with-x use the X Window System" # Initialize some variables set by options. @@ -562,6 +565,9 @@ LIBNAME="libfltk.a" +LIBRARY="../lib/\$(LIBNAME)" +LIBFLTK="../lib/\$(LIBNAME)" +LINKFLTK="-L../lib -lfltk" if test "$RANLIB" != ":"; then LIBCOMMAND="ar cr" else @@ -600,8 +606,23 @@ # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" + : +fi + +# Check whether --enable-libtool or --disable-libtool was given. +if test "${enable_libtool+set}" = set; then + enableval="$enable_libtool" -if eval "test x$enable_shared = xyes"; then +if eval "test x$enable_libtool != xno"; then + LIBTOOL="$enable_libtool" + enable_shared=no +else + LIBTOOL="" +fi +fi + + +if test "$enable_shared" = "yes"; then PICFLAG=1 case $uname in SunOS* | UNIX_S*) @@ -638,13 +659,18 @@ ;; esac fi -fi +if test "x$LIBTOOL" != "x"; then + LIBNAME="libfltk.la" + LIBRARY="\$(LIBNAME)" + LIBFLTK="../src/\$(LIBNAME)" + LINKFLTK="../src/\$(LIBNAME)" +fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:648: checking for $ac_word" >&5 +echo "configure:674: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3220,6 +3246,10 @@ + + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -3369,7 +3399,11 @@ s%@DSONAME@%$DSONAME%g s%@DSOCOMMAND@%$DSOCOMMAND%g s%@LIBNAME@%$LIBNAME%g +s%@LIBRARY@%$LIBRARY%g +s%@LIBFLTK@%$LIBFLTK%g +s%@LINKFLTK@%$LINKFLTK%g s%@LIBCOMMAND@%$LIBCOMMAND%g +s%@LIBTOOL@%$LIBTOOL%g s%@MAKEDEPEND@%$MAKEDEPEND%g CEOF