From 6dd65fc048dbe167b809f687acc6228eb07ecec6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 6 Jun 2021 20:48:46 -0400
Subject: 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.
---
 sim/or1k/aclocal.m4 |  1 -
 sim/or1k/config.in  |  9 ------
 sim/or1k/configure  | 79 ++---------------------------------------------------
 3 files changed, 2 insertions(+), 87 deletions(-)

(limited to 'sim/or1k')

diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index 50bdf77..be3ce43 100644
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
 m4_include([../../config/lead-dot.m4])
diff --git a/sim/or1k/config.in b/sim/or1k/config.in
index 29d1fe2..c3a5c27 100644
--- a/sim/or1k/config.in
+++ b/sim/or1k/config.in
@@ -56,9 +56,6 @@
    */
 #undef LT_OBJDIR
 
-/* Name of this package. */
-#undef PACKAGE
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -77,12 +74,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/or1k/configure b/sim/or1k/configure
index 88a1b0c..5c1c378 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -637,9 +637,6 @@ cgen_breaks
 cgen
 cgendir
 CGEN_MAINT
-REPORT_BUGS_TEXI
-REPORT_BUGS_TO
-PKGVERSION
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -679,7 +676,6 @@ USE_NLS
 CCDEPMODE
 DEPDIR
 am__leading_dot
-PACKAGE
 C_DIALECT
 RANLIB
 AR
@@ -775,8 +771,6 @@ with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
 enable_sim_inline
-with_pkgversion
-with_bugurl
 enable_sim_endian
 enable_sim_alignment
 enable_sim_bitsize
@@ -1451,8 +1445,6 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pkgversion=PKG   Use PKG in the version string in place of "SIM"
-  --with-bugurl=URL       Direct users to URL to report a bug
 
 Some influential environment variables:
   CC          C compiler command
@@ -6906,17 +6898,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_config_headers="$ac_config_headers config.h:config.in"
 
 
-# Some of the common include files depend on bfd.h, and bfd.h checks
-# that config.h is included first by testing that the PACKAGE macro
-# is defined.
-PACKAGE=sim
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-
 # Dependency checking.
 ac_config_commands="$ac_config_commands depdir"
 
@@ -10780,7 +10761,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10783 "configure"
+#line 10764 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10886,7 +10867,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10889 "configure"
+#line 10870 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11182,62 +11163,6 @@ 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="(SIM) "
-
-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
-
-
-
-
 
 
 wire_endian="BIG"
-- 
cgit v1.1