-dnl $Id: aclocal.m4,v 1.83 2001/09/20 14:08:13 sewardj Exp $
+dnl $Id: aclocal.m4,v 1.90 2001/12/13 09:23:23 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
fi
HappyVersion=$fptools_cv_happy_version;
AC_SUBST(HappyVersion)
+
+# 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)
])
dnl
])
dnl
+dnl Check whether ld supports -x
+dnl
+AC_DEFUN(FPTOOLS_LD_X,
+[AC_CACHE_CHECK([whether ld understands -x], fptools_cv_ld_x,
+[
+echo 'foo() {}' > conftest.c
+${CC-cc} -c conftest.c
+if ${LdCmd} -r -x -o foo.o conftest.o; then
+ fptools_cv_ld_x=yes
+else
+ fptools_cv_ld_x=no
+fi
+rm -rf conftest.c conftest.o foo.o
+])
+if test "$fptools_cv_ld_x" = yes; then
+ LdXFlag=-x
+else
+ LdXFlag=
+fi
+AC_SUBST(LdXFlag)
+])
+
+dnl
dnl Finding the Right Yacc
dnl
AC_DEFUN(FPTOOLS_PROG_YACCY,
])
dnl
+dnl Getting at the right version of 'find'
+dnl (i.e., not the MS util on a Win32 box).
+dnl
+AC_DEFUN(FPTOOLS_FIND_FIND,
+[
+AC_PATH_PROG(Find2Cmd, find)
+$Find2Cmd --version > conftest.out 2>&1
+if grep "FIND: Parameter format" conftest.out >/dev/null 2>&1 ; then
+ # Encountered MS' find utility, which is not what we're after.
+ #
+ # HACK - AC_CHECK_PROG is useful here in that does let you reject
+ # an (absolute) entry in the path (Find2Cmd). It is not so useful
+ # in that it doesn't let you (AFAIU) set VARIABLE equal to the
+ # absolute path eventually found. So, hack around this by inspecting
+ # what variables hold the abs. path & use them directly.
+ AC_CHECK_PROG(FindCmd,find,`echo $ac_dir/$ac_word`,find,,$Find2Cmd)
+else
+FindCmd=$Find2Cmd
+AC_SUBST(FindCmd)
+fi
+])
+
+dnl
dnl FPTOOLS_NOCACHE_CHECK prints a message, then sets the
dnl values of the second argument to the result of running
dnl the commands given by the third. It does not cache its
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case "$host" in
-*-*-beos* | *-*-macosx*)
+*-*-beos*)
# These system don't have libm
;;
*-ncr-sysv4.3*)
CFLAGS="$save_CFLAGS"
])
if test "$ac_cv_cc_$2"x = "yesx"; then
- $2=$extra_flag;
+ $2=$1;
else
- $2=$extra_flag;
+ $2="";
fi;
])