-dnl $Id: aclocal.m4,v 1.87 2001/11/07 20:13:26 sof Exp $
+dnl $Id: aclocal.m4,v 1.92 2002/01/07 20:46:52 sof Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
if test -d $srcdir/happy; then
SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
fi
-AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
+if test x"$UseSrcTreeHappy" = xYES; then
+ HappyCmd=$SrcTreeHappyCmd
+else
+ AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
+fi
AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
changequote(, )dnl
[if test x"$HappyCmd" = x"$SrcTreeHappyCmd"; then
# 1.9 and later is required, assume that we can use
# the "-agc" options.
HappyOpts="-agc"
+
+FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-gt,[1.11],
+ [HappyOpts=-agcs])
+
AC_SUBST(HappyOpts)
])
AC_CACHE_VAL(AC_CV_NAME,
[AC_TRY_RUN([#include <stdio.h>
#include <stddef.h>
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
#ifdef HAVE_SIGNAL_H
-#include <signal.h>
+# include <signal.h>
#endif
+
#ifdef HAVE_TIME_H
-#include <time.h>
+# include <time.h>
+#endif
+
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_CTYPE_H
+# include <ctype.h>
+#endif
+
#ifdef HAVE_GL_GL_H
-#include <GL/gl.h>
+# include <GL/gl.h>
#endif
typedef $1 testing;
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case "$host" in
-*-*-beos* | *-*-macosx*)
+*-*-beos*)
# These system don't have libm
;;
*-ncr-sysv4.3*)