r3892: Auto commit for Debian build

diff --git a/Makefile.in b/Makefile.in
index d8572c665662e473ec8509c65443d530309c8dcf..2080bc26dfa6f098e87aeb14deac94142bed6cc3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -388,8 +388,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 #install-data-hook: 
-#      test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
-#      install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
+       #test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
+       #install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/configure b/configure
index f78b3d60a3f6a1d7fc03d9a19b441382d725f8c7..98fb09e2f70af57f7f97be88508a84c9972b81e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -7908,7 +7908,7 @@ if test "${with_mcpu+set}" = set; then
 
 fi;
 
-if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
+if test "$withval" == "pentium4" -o "$withval" == "athlon"  ; then
   echo "$as_me:$LINENO: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
   CFLAGS="$CFLAGS -mcpu=$withval"

diff --git a/configure.ac b/configure.ac
index 029dbc41f9f542ffe526a922729ea979e67f8f26..34ca6c2d114ade8630b38067169d4dca7b95771f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,7 +246,7 @@ AC_MSG_CHECKING([for CPU specification])
 AC_ARG_WITH(mcpu,
 [  --with-mcpu[=CPU]         Set name of CPU for gcc -mcpu])
 
-if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
+if test "$withval" == "pentium4" -o "$withval" == "athlon"  ; then
   AC_MSG_RESULT([$withval])
   CFLAGS="$CFLAGS -mcpu=$withval"
 elif test "$withval" == "no"; then