sim: unify bug & package settings

Move these options up to the common dir so we only test & export
them once across all ports.  The AC_INIT macro does a lot of the
heavy lifting already which allows further simplification.

5 files changed, 11 insertions, 75 deletions

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 2a5b8ca..3926430 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,5 +1,16 @@
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure.ac: Delete calls to ACX_PKGVERSION & ACX_BUGURL.
+	* aclocal.m4, config.in, configure: Regenerate.
+
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete sim-stdio & sim-trace.
+	* debug.h: Define TRACE_* defines.
+	* config.in, configure: Regenerate.
+
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac: Delete AC_STRUCT_*, AC_TYPE_*, AC_CHECK_FUNCS,
 	AC_CHECK_HEADERS, and AC_HEADER_DIRENT calls.
 	* config.in, configure: Regenerate.
diff --git a/sim/ppc/aclocal.m4 b/sim/ppc/aclocal.m4
index 98ea2b3..16c4360 100644
--- a/sim/ppc/aclocal.m4
+++ b/sim/ppc/aclocal.m4
@@ -12,7 +12,6 @@
 # PARTICULAR PURPOSE.
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([../../config/acx.m4])
 m4_include([../../config/gettext-sister.m4])
 m4_include([../../config/plugins.m4])
 m4_include([../../config/zlib.m4])
diff --git a/sim/ppc/config.in b/sim/ppc/config.in
index 02e6d94..7b75892 100644
--- a/sim/ppc/config.in
+++ b/sim/ppc/config.in
@@ -67,12 +67,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Additional package description */
-#undef PKGVERSION
-
-/* Bug reporting address */
-#undef REPORT_BUGS_TO
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 49990a4..5f0f779 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -675,9 +675,6 @@ build_os
 build_vendor
 build_cpu
 build
-REPORT_BUGS_TEXI
-REPORT_BUGS_TO
-PKGVERSION
 WERROR_CFLAGS
 EGREP
 GREP
@@ -774,8 +771,6 @@ enable_sim_timebase
 enable_werror
 enable_sim_warnings
 enable_sim_xor_endian
-with_pkgversion
-with_bugurl
 with_system_zlib
 enable_plugins
 '
@@ -1439,8 +1434,6 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
-  --with-bugurl=URL       Direct users to URL to report a bug
   --with-system-zlib      use installed libz
 
 Some influential environment variables:
@@ -4488,62 +4481,6 @@ else
 fi
 
 
-
-
-# Check whether --with-pkgversion was given.
-if test "${with_pkgversion+set}" = set; then :
-  withval=$with_pkgversion; case "$withval" in
-      yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;;
-      no)  PKGVERSION= ;;
-      *)   PKGVERSION="($withval) " ;;
-     esac
-else
-  PKGVERSION="(GDB) "
-
-fi
-
-
-
-
-
-# Check whether --with-bugurl was given.
-if test "${with_bugurl+set}" = set; then :
-  withval=$with_bugurl; case "$withval" in
-      yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;;
-      no)  BUGURL=
-	   ;;
-      *)   BUGURL="$withval"
-	   ;;
-     esac
-else
-  BUGURL="https://www.gnu.org/software/gdb/bugs/"
-
-fi
-
-  case ${BUGURL} in
-  "")
-    REPORT_BUGS_TO=
-    REPORT_BUGS_TEXI=
-    ;;
-  *)
-    REPORT_BUGS_TO="<$BUGURL>"
-    REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
-    ;;
-  esac;
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define PKGVERSION "$PKGVERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define REPORT_BUGS_TO "$REPORT_BUGS_TO"
-_ACEOF
-
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 9783dcf..5697345 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -592,11 +592,6 @@ if test x"$silent" != x"yes" && test x"$sim_xor_endian" != x""; then
 fi],[sim_xor_endian=""])dnl
 
 
-ACX_PKGVERSION([GDB])
-ACX_BUGURL([https://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])
-
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM