Fix remaining non-unicode strings for wxwidgets

[ctsim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0f16b7a94fb41ef0289be5bcdaf76cd979b2a651..65b96095e8e8d85036d9f939a9fc68fec03cd292 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,27 @@
+dnl *****************************************************************************
+dnl FILE IDENTIFICATION
+dnl   Name:          ctsim.cpp
+dnl   Purpose:       Top-level routines of CTSim program
+dnl   Programmer:    Kevin Rosenberg
+dnl   Date Started:  July 2000
+dnl
+dnl  This is part of the CTSim program
+dnl  Copyright (c) 1983-2009 Kevin Rosenberg
+dnl
+dnl  This program is free software; you can redistribute it and/or modify
+dnl  it under the terms of the GNU General Public License (version 2) as
+dnl  published by the Free Software Foundation.
+dnl
+dnl  This program is distributed in the hope that it will be useful,
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl  GNU General Public License for more details.
+dnl
+dnl  You should have received a copy of the GNU General Public License
+dnl  along with this program; if not, write to the Free Software
+dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl****************************************************************************/
+
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Must reset CDPATH so that bash's cd does not print to stdout
@@ -6,14 +30,9 @@ dnl CDPATH=
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,5.0.0)
+AM_INIT_AUTOMAKE(ctsim,5.1.2)
 AM_CONFIG_HEADER(config.h)
 
-CFLAGS=""
-CXXFLAGS=""
-
-CFLAGS="${CFLAGS}"
-
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -136,7 +155,7 @@ dnl CFLAGS="$CFLAGS -I/usr/local/include"
 dnl LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 if test "$debug" = "true" ; then
-  CFLAGS="$CFLAGS -g -DDEBUG"
+  CFLAGS="$CFLAGS -g -O0 -DDEBUG"
   AC_DEFINE(DEBUG,1,[turn on debugging])
 else
   CFLAGS="$CFLAGS -O2 -DNDEBUG -fomit-frame-pointer"
@@ -289,7 +308,7 @@ AC_ARG_WITH(webdata-url, [  --with-webdata-url=PATH Set URL path of webdata],
 AC_ARG_WITH(html-dir, [  --with-html-dir=PATH    Set directory of html files], 
 [ html_%dir=$withval ; AC_SUBST(htmldir) ] )
 
-if test "x$cgibindir" = "x" -o "x$cgibinurl" = "x" ; then
+if test "x$cgibindir" != "x" -o "x$cgibinurl" != "x" ; then
   cgiprograms="ctsim.cgi ctsim.conf"
   AC_SUBST(cgiprograms)
 fi
@@ -356,9 +375,9 @@ if test "$with_x" != "no" && test "$wxwin" = "true"; then
          wxdebug="--debug"
        fi  
       if test "x$wx_gtk" != "x" ; then
-       ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --version=2.8  --libs` -lwx_gtk2u_gl-2.8 ${GTK_LIBS} ${GLIB_LIBS}"
+       ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --version=2.8  --libs std,gl` ${GTK_LIBS} ${GLIB_LIBS}"
       elif test "x$wx_mac" != "x" ; then
-        ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --version=2.8 --libs` -lwx_macu_gl-2.8"
+        ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --version=2.8 --libs std,gl`"
       fi
     fi
   fi