This commit was manufactured by cvs2svn to create branch 'gdb_7_0-branch'.

[thirdparty/binutils-gdb.git] / sim / common / common.m4

diff --git a/sim/common/common.m4 b/sim/common/common.m4
index cf6e06ccf22c9d9641cd291bd9a00635c6ae408d..215208d87121023239ff045b619fccf36c09d900 100644 (file)
--- a/sim/common/common.m4
+++ b/sim/common/common.m4
@@ -39,7 +39,7 @@ AC_PROG_RANLIB
 dnl We don't use gettext, but bfd does.  So we do the appropriate checks
 dnl to see if there are intl libraries we should link against.
 ALL_LINGUAS=
-CY_GNU_GETTEXT
+ZW_GNU_GETTEXT_SISTER_DIR(../../intl)
 
 # Check for common headers.
 # FIXME: Seems to me this can cause problems for i386-windows hosts.
@@ -54,6 +54,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.
+AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+
 . ${srcdir}/../../bfd/configure.host
 
 dnl Standard (and optional) simulator options.
@@ -195,6 +199,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