r3881: *** empty log message ***

diff --git a/configure b/configure
index c0338ea2ffdc573d97fdf05e713c741c475b19ac..0b3012d34efb5d0228d44e050881fcc5b568db06 100755 (executable)
--- a/configure
+++ b/configure
@@ -873,6 +873,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-lam=PATH       Set path of LAM MPI
   --with-ctn=PATH       Set path of CTN DICOM library
+  --with-cpu=CPU       Set name of CPU for gcc -mcpu=
   --with-cgibin-dir=PATH  Set path of CGI binaries directory
   --with-cgibin-url=PATH  Set URL path of CGI binaries
   --with-webdata-dir=PATH Set path of webdata
@@ -7898,6 +7899,22 @@ echo "${ECHO_T}no" >&6
   fi
 fi
 
+
+# Check whether --with-cpu or --without-cpu was given.
+if test "${with_cpu+set}" = set; then
+  withval="$with_cpu"
+
+fi;
+
+if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
+  echo "$as_me:$LINENO: checking Setting CPU to $withval" >&5
+echo $ECHO_N "checking Setting CPU to $withval... $ECHO_C" >&6
+  CFLAGS="$CFLAGS -mcpu=$withval"
+else
+  echo "$as_me:$LINENO: checking Unknown CPU $withval" >&5
+echo $ECHO_N "checking Unknown CPU $withval... $ECHO_C" >&6
+fi
+
 echo "$as_me:$LINENO: checking for web access" >&5
 echo $ECHO_N "checking for web access... $ECHO_C" >&6
 

diff --git a/configure.ac b/configure.ac
index 36dca45044f820248a82001a1c6e669d20d9e30b..4ad6678a5978025ac2001a0a8e1c09d2e7c95acf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,17 @@ else
   fi
 fi
 
+dnl Set CPU
+AC_ARG_WITH(cpu,
+[  --with-cpu[=CPU]       Set name of CPU for gcc -mcpu=])
+
+if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
+  AC_MSG_CHECKING([Setting CPU to $withval])
+  CFLAGS="$CFLAGS -mcpu=$withval"
+else
+  AC_MSG_CHECKING([Unknown CPU $withval])
+fi
+
 AC_MSG_CHECKING([for web access])
 dnl Set cgi-bin directory
 AC_ARG_WITH(cgibin-dir, [  --with-cgibin-dir=PATH  Set path of CGI binaries directory ], 

diff --git a/debian/changelog b/debian/changelog
index 55f424758b84133c98ea8b31065e325dffd4201c..fa53edaf9c2813321ba9cc0a730511710b10d133 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ctsim (4.0.2-1) unstable; urgency=low
+
+  * Remove debugging statement
+  * Add support for --with-cpu configuration option
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 29 Jan 2003 19:25:11 -0700
+
 ctsim (4.0.1-1) unstable; urgency=low
 
   * Make sure to call OnUpdate as well as UpdateAllViews since the

diff --git a/src/views.cpp b/src/views.cpp
index 2d7874d690f5364f46f81e0a1d832b708c87cc4c..22c5e1234f1742a0c3eb9292f56e983aaae6b803 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.168 2003/01/29 07:30:49 kevin Exp $
+**  $Id: views.cpp,v 1.169 2003/01/30 02:25:22 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -1088,7 +1088,9 @@ void
 ImageFileView::OnDraw (wxDC* dc)
 {
   if (m_pBitmap && m_pBitmap->Ok()) {
-    *theApp->getLog() << "Drawing bitmap";
+#ifdef DEBUG    
+    *theApp->getLog() << "Drawing bitmap\n";
+#endif
     dc->DrawBitmap(*m_pBitmap, 0, 0, false);
   }
   
@@ -1144,7 +1146,9 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
       delete m_pBitmap;
       m_pBitmap = NULL;
     }
-    *theApp->getLog() << "Making new bitmap bitmap";
+#ifdef DEBUG
+    *theApp->getLog() << "Making new bitmap\n";
+#endif
     m_pBitmap = new wxBitmap (image);
     delete imageData;
     m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);