Now don't enable XDBE under SunOS or IRIX 6.3 or earlier.

Added HP C++ compiler warning options.

Added HP-UX check with (v)snprintf() - HP-UX has them, but doesn't have
prototypes...


git-svn-id: file:///fltk/svn/fltk/trunk@311 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1999-02-22 20:53:35 +00:00
parent 74ea22b252
commit c33c7ff0b8
2 changed files with 40 additions and 21 deletions
+30 -10
View File
@@ -1,7 +1,7 @@
dnl# -*- sh -*- dnl# -*- sh -*-
dnl# the "configure" script is made from this by running GNU "autoconf" dnl# the "configure" script is made from this by running GNU "autoconf"
dnl# dnl#
dnl# "$Id: configure.in,v 1.23 1999/02/18 15:05:50 mike Exp $" dnl# "$Id: configure.in,v 1.24 1999/02/22 20:53:33 mike Exp $"
dnl# dnl#
dnl# Configuration script for the Fast Light Tool Kit (FLTK). dnl# Configuration script for the Fast Light Tool Kit (FLTK).
dnl# dnl#
@@ -36,6 +36,14 @@ else
LIBCOMMAND="ar crs" LIBCOMMAND="ar crs"
fi fi
dnl# Get the operating system and version number...
uname=`uname`
uversion=`uname -r | sed -e '1,$s/\.//g'`
if test "$uname" = "IRIX64"; then
uname="IRIX"
fi
dnl# Clear debugging flags and only enable debugging if the user asks for dnl# Clear debugging flags and only enable debugging if the user asks for
dnl# it. dnl# it.
@@ -49,7 +57,7 @@ fi])
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[ AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[
if eval "test x$enable_shared = xyes"; then if eval "test x$enable_shared = xyes"; then
RANLIB=":" RANLIB=":"
case `uname` in case $uname in
SunOS* | UNIX_S*) SunOS* | UNIX_S*)
LIBNAME="libfltk.so.1" LIBNAME="libfltk.so.1"
LIBCOMMAND="\$(CXX) -G $DEBUGFLAG -o" LIBCOMMAND="\$(CXX) -G $DEBUGFLAG -o"
@@ -105,11 +113,17 @@ fi
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_CHECK_HEADER(sys/select.h) AC_CHECK_HEADER(sys/select.h)
AC_CHECK_FUNCS(scandir, AC_CHECK_FUNCS(scandir,
if test "`(uname) 2>/dev/null`" != "SunOS"; then if test "$uname" != "SunOS"; then
AC_DEFINE(HAVE_SCANDIR) AC_DEFINE(HAVE_SCANDIR)
fi) fi)
AC_CHECK_FUNCS(vsnprintf) AC_CHECK_FUNCS(vsnprintf,
AC_CHECK_FUNCS(snprintf) if test "$uname" != "HP-UX"; then
AC_DEFINE(HAVE_VSNPRINTF)
fi)
AC_CHECK_FUNCS(snprintf,
if test "$uname" != "HP-UX"; then
AC_DEFINE(HAVE_SNPRINTF)
fi)
AC_CHECK_FUNCS(vsprintf) AC_CHECK_FUNCS(vsprintf)
AC_PATH_XTRA AC_PATH_XTRA
@@ -127,7 +141,13 @@ AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lGLU -lGL", \
-lX11 -lXext $X_EXTRA_LIBS -lm) -lX11 -lXext $X_EXTRA_LIBS -lm)
AC_SUBST(GLLIB) AC_SUBST(GLLIB)
AC_CHECK_HEADER(X11/extensions/Xdbe.h, AC_DEFINE(HAVE_XDBE)) AC_CHECK_HEADER(X11/extensions/Xdbe.h, \
if test "$uname" != "SunOS" -a "$uname" != "IRIX"; then
AC_DEFINE(HAVE_XDBE)
fi
if test "$uname" == "IRIX" -a "$uversion" -gt 63; then
AC_DEFINE(HAVE_XDBE)
fi)
AC_CACHE_CHECK("for X overlay visuals", ac_cv_have_overlay, AC_CACHE_CHECK("for X overlay visuals", ac_cv_have_overlay,
if xprop -root 2>/dev/null | grep -c "SERVER_OVERLAY_VISUALS" >/dev/null; then if xprop -root 2>/dev/null | grep -c "SERVER_OVERLAY_VISUALS" >/dev/null; then
@@ -155,7 +175,7 @@ else
IRIX*) IRIX*)
# Running some flavor of IRIX; see which version and # Running some flavor of IRIX; see which version and
# set things up according... # set things up according...
if expr "`(uname -r)`" \>= 6.2; then if test "$uversion" -ge 62; then
# We are running IRIX 6.2 or higher; uncomment the following # We are running IRIX 6.2 or higher; uncomment the following
# lines if you don't have IDO 7.2 or higher: # lines if you don't have IDO 7.2 or higher:
# #
@@ -175,11 +195,11 @@ else
CXXFLAGS="-O2 $CXXFLAGS" CXXFLAGS="-O2 $CXXFLAGS"
fi fi
;; ;;
HP-UX) HP-UX*)
# Running HP-UX; these options should work for the HP compilers. # Running HP-UX; these options should work for the HP compilers.
if test -z "$DEBUGFLAG"; then if test -z "$DEBUGFLAG"; then
CFLAGS="+O2 $CFLAGS" CFLAGS="+O2 $CFLAGS"
CXXFLAGS="+O2 $CXXFLAGS" CXXFLAGS="+O2 +W336,501,736,740,749,829 $CXXFLAGS"
fi fi
;; ;;
*) *)
@@ -203,5 +223,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude) AC_OUTPUT(makeinclude)
dnl# dnl#
dnl# End of "$Id: configure.in,v 1.23 1999/02/18 15:05:50 mike Exp $". dnl# End of "$Id: configure.in,v 1.24 1999/02/22 20:53:33 mike Exp $".
dnl# dnl#
+10 -11
View File
@@ -185,8 +185,8 @@ subexpressions literally. </LI>
<BR> static void Fl::add_fd(int fd, int when, void (*cb)(int, void *), <BR> static void Fl::add_fd(int fd, int when, void (*cb)(int, void *),
void * = 0)</A> void * = 0)</A>
<BR><A name=remove_fd>static void Fl::remove_fd(int)</A></H3> <BR><A name=remove_fd>static void Fl::remove_fd(int)</A></H3>
Add file descriptor <TT>fd</TT> to listen to. When the <TT>fd</TT> Add file descriptor <TT>fd</TT> to listen to. When the <TT>fd</TT>
becomes ready for reading the callback is done. The callback is becomes ready for reading the callback is done. The callback is
passed the <TT>fd</TT> and the arbitrary <TT>void *</TT> argument. <TT> passed the <TT>fd</TT> and the arbitrary <TT>void *</TT> argument. <TT>
Fl::wait()</TT> will return immediately after calling the callback. Fl::wait()</TT> will return immediately after calling the callback.
<P>The second version takes a <TT>when</TT> bitfield, with the bits <TT> <P>The second version takes a <TT>when</TT> bitfield, with the bits <TT>
@@ -214,23 +214,22 @@ zero from its <TT>handle()</TT> method. Exactly which ones may change
in future versions, however. </LI> in future versions, however. </LI>
</UL> </UL>
<H3><A name=add_idle>static Fl::add_idle(void (*cb)(void *), void *)</A></H3> <H3><A name=add_idle>static Fl::add_idle(void (*cb)(void *), void *)</A></H3>
Adds a callback function that is called by <TT>Fl::wait()</TT> when Adds a callback function that is called by <TT>Fl::wait()</TT> when
there is nothing to do. This can be used for background processing. there is nothing to do. This can be used for background processing.
<P><I>Warning: this can absorb all your machine's time!</I></P> <P><I>Warning: this can absorb all your machine's time!</I></P>
<P>You can have multiple idle callbacks. To remove an idle callback use <A <P>You can have multiple idle callbacks. To remove an idle callback use <A
href=#remove_idle><TT>Fl::remove_idle()</TT></A>. </P> href=#remove_idle><TT>Fl::remove_idle()</TT></A>. </P>
<P>Only <TT>Fl::wait()</TT> calls the idle callbacks. <TT>Fl::wait(time)</TT> <P><TT>Fl::wait()</TT> and <TT>Fl::check()</TT> call idle callbacks,
, <TT>Fl::check()</TT>, and <TT>Fl::ready()</TT> ignore them so that but <TT>Fl::ready()</TT> does not.</P>
these functions may be called by the idle callbacks themselves without
having to worry about recursion. </P>
<P>The idle callback can call any FLTK functions. However if you call <P>The idle callback can call any FLTK functions. However if you call
something that calls <TT>Fl::wait()</TT> (such as a message pop-up) you something that calls <TT>Fl::wait()</TT> or <TT>Fl::check()</TT> (such
should first remove the idle callback so that it does not recurse. </P> as a message pop-up) you should first remove the idle callback so that
it does not recurse. </P>
<H3><A name=add_timeout>static void Fl::add_timeout(float t, void <H3><A name=add_timeout>static void Fl::add_timeout(float t, void
(*cb)(void *),void *v=0)</A></H3> (*cb)(void *),void *v=0)</A></H3>
Add a one-shot timeout callback. The timeout will happen as soon as Add a one-shot timeout callback. The timeout will happen as soon as
possible after <TT>t</TT> seconds after the last time <TT>wait()</TT> possible after <TT>t</TT> seconds after the last time <TT>wait()</TT>
was called. The optional <TT>void *</TT> argument is passed to the was called. The optional <TT>void *</TT> argument is passed to the
callback. callback.
<P>This code will print &quot;TICK&quot; each second on stdout, no matter what <P>This code will print &quot;TICK&quot; each second on stdout, no matter what
else the user or program does: </P> else the user or program does: </P>