d2241bc129
- Added new const const pointer versions of pixmap functions to eliminate
an annoying pointer warning message that was generated by the Sun and
other C++ compilers.
- Eliminated all "var hides class::var" warnings.
- Eliminated all "string literal converted to char *" warnings.
- The file chooser buttons use user_data() rather than the label to decide
what to do, allowing the label to be somewhat cleaner.
- Fl_has_idle only tested N-1 callbacks and missed one.
- Fl_Gl_Window has a new method to allow you to get and set the context:
void Fl_Gl_Window::context(void*, int destroy = 0)
void* Fl_Gl_Window::context() const;
Return or set a pointer to the GLContext that this window is using. This
is a system-dependent structure, but it is portable to copy the context
from one window to another. You can also set it to NULL, which will
force FLTK to recreate the context the next time make_current() is
called, this is useful for getting around bugs in OpenGL implementations.
If destroy_flag is true the context will be destroyed by fltk when the
window is destroyed, or when the mode() is changed, or the next time
context(x) is called.
- Added Fl::add_check(...), Fl::remove_check, and Fl::has_check. These are
similar to idle callbacks but are only called just before it waits for
new events. They can be used to watch for changes in global state and
respond to them.
- Added simple FLTK and FLUID manual pages.
93 lines
2.2 KiB
Text
93 lines
2.2 KiB
Text
$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
|