aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-10-05 02:32:25 +0000
committerMike Frysinger <vapier@gentoo.org>2011-10-05 02:32:25 +0000
commit4a99173dc363332fe92b6783151b1270ee8e4b39 (patch)
tree7110bb4ed528079577fbddc85fb62305f4ce4382
parent98acb302866996d8eaa1b3161f1b1eb58c2ccdcf (diff)
downloadgdb-4a99173dc363332fe92b6783151b1270ee8e4b39.zip
gdb-4a99173dc363332fe92b6783151b1270ee8e4b39.tar.gz
gdb-4a99173dc363332fe92b6783151b1270ee8e4b39.tar.bz2
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>
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/aclocal.m48
2 files changed, 13 insertions, 0 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 149a329..3646002 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -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.
diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4
index 5a34c21..37aed32 100644
--- a/sim/common/aclocal.m4
+++ b/sim/common/aclocal.m4
@@ -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