sim: merge changes from common.m4 back into SIM_AC_COMMON

Seems some fixes were added to the common.m4 file but not the
SIM_AC_COMMON macro.  Keep the two in sync since they're supposed
to be the same thing.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-10-05 02:32:25 +00:00
parent 98acb30286
commit 4a99173dc3
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2011-10-04 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4 (SIM_AC_COMMON): Call AM_ZLIB, ACX_PKGVERSION, and
ACX_BUGURL. Define PKGVERSION and REPORT_BUGS_TO.
2011-07-12 Mike Frysinger <vapier@gentoo.org>
* sim-command.c: Include sim-options.h.

View File

@ -63,6 +63,10 @@ AC_CHECK_FUNCS(getrusage time sigaction __setfpucw)
AC_CHECK_LIB(socket, bind)
AC_CHECK_LIB(nsl, gethostbyname)
# BFD conditionally uses zlib, so we must link it in if libbfd does, by
# using the same condition.
AM_ZLIB
. ${srcdir}/../../bfd/configure.host
dnl Standard (and optional) simulator options.
@ -204,6 +208,10 @@ if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl
AC_SUBST(sim_profile)
ACX_PKGVERSION([GDB])
ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
dnl Types used by common code
AC_TYPE_SIGNAL