Fix bugs, fix older cruft

[ctsim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6d884aa4b3797c0f99bd7a47d93c12297e65f58a..78bcb8a1bf64ff381034bf1eb3863b3f40bad0d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl CDPATH=
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.5.1)
+AM_INIT_AUTOMAKE(ctsim,4.5.2)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -20,7 +20,7 @@ AC_PROG_CXX
 AC_C_BIGENDIAN
 
 AC_PATH_PROG(wxconfig,wxgtk-2.4-config)
-if [ ! "$wxconfig" ]; then
+if test -z "$wxconfig" ; then
   AC_PATH_PROG(wxconfig,wx-config)
 fi
 
@@ -338,7 +338,7 @@ if test "$with_x" != "no" && test "$wxwin" = "true"; then
     ctlib_graphics="$ctlib_graphics -lGL -lGLU"
     if test "$wxwin" = "true" ; then
       if [ "$wx_gtk" ]; then 
-        ctlib_graphics="$ctlib_graphics `wx-config --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
+        ctlib_graphics="$ctlib_graphics `$wxconfig --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
       elif [ "$wx_mac" ]; then
         ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
       fi