-dnl $Id: aclocal.m4,v 1.112 2003/01/26 12:56:00 panne Exp $
+dnl $Id: aclocal.m4,v 1.115 2003/03/26 12:33:11 simonmar Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
echo "You don't seem to have ar in your PATH...I have no idea how to make a library"
exit 1;
fi
-if $ArCmdRaw clqsZ conftest.a >/dev/null 2>/dev/null; then
+dnl GNU ar needs special treatment: it appears to have problems with
+dnl object files with the same name if you use the 's' modifier, but
+dnl simple 'ar q' works fine, and doesn't need a separate ranlib.
+if $ArCmdRaw --version | grep 'GNU' >/dev/null 2>/dev/null; then
+ ArCmdArgs='q'
+ NeedRanLib=''
+elif $ArCmdRaw clqsZ conftest.a >/dev/null 2>/dev/null; then
ArCmdArgs="clqsZ"
NeedRanLib=''
elif $ArCmdRaw clqs conftest.a >/dev/null 2>/dev/null; then
# include <GL/gl.h>
#endif
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
typedef $1 testing;
main() {
dnl Check for Mesa first if we were asked to.
AC_ARG_ENABLE(Mesa,
- AC_HELP_STRING([--enable-Mesa],
- [Prefer Mesa over a vendor's native OpenGL library (default=no)]),
+[ --enable-mesa
+ Prefer Mesa over a vendor's native OpenGL library (default=no)
+],
use_Mesa=$enableval,
use_Mesa=no)
fi
fi
fi
- AC_MSG_NOTICE([It looks like GL version ${fptools_gl_version}])
+ echo "It looks like GL version ${fptools_gl_version}"
dnl TODO: Cache the results of the tests for the imaging subset.
fi
fi
fi
- AC_MSG_NOTICE([It looks like GLU version ${fptools_glu_version}])
+ echo "It looks like GLU version ${fptools_glu_version}"
FPTOOLS_SEARCH_LIBS([#include <GL/glx.h>], glXWaitX, $GLX_search_list, have_GLX=yes, have_GLX=no)
FPTOOLS_SEARCH_LIBS([#include <GL/glut.h>], glutMainLoop, glut32 glut, have_glut=yes, have_glut=no)
dnl
dnl Check to see whether CC (gcc) supports a particular option.
-dnl
+dnl
AC_DEFUN(FPTOOLS_CC_FLAG,
[
AC_CACHE_CHECK([whether $CC accepts $1], [ac_cv_cc_$2],