fix build on multiple versions of wx-config

diff --git a/ChangeLog b/ChangeLog
index 4429dc21b3e895fe052bd275b7abb45a5a81dd4e..cbdd961e1188cb121c053ac320ced6500656c94c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sep 10, 2007  Version 4.5.4
+       * configure.ac: Fix builds with multiple versions of wx-config
+       -- thanks to Steve White
+
 Apr 1, 2007  Version 4.5.3
        * include/timer.h: Fix building on GCC 4.3
        -- thanks to Martin Michlmayr

diff --git a/Makefile.in b/Makefile.in
index c12b66e78484841fdf78737cd0d6200347a79576..c2edfa84c74fcf3c7af61cda58c231400762d2b3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,7 +193,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
        COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
        config.guess config.h.in config.sub configure configure.ac \
-       configure.in depcomp install-sh missing mkinstalldirs
+       depcomp install-sh missing mkinstalldirs
 DIST_SUBDIRS = man libctsupport libctsim html cgi-bin include getopt \
        libctgraphics src tools helical
 all: config.h

diff --git a/configure b/configure
index 8c25f9cd7ddd34ab22773397d5e7c5d5f2fe3edb..9e1d2ff203452ab761ccc4925755d369ac3745be 100755 (executable)
--- a/configure
+++ b/configure
@@ -4969,7 +4969,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-if  ! "$wxconfig" ; then
+if test -z "$wxconfig" ; then
   # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -11133,7 +11133,7 @@ echo "${ECHO_T}yes" >&6; }
     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

diff --git a/configure.ac b/configure.ac
index f0c72fefd4cbeac126fcfdc4c9faa8b5ae481142..78bcb8a1bf64ff381034bf1eb3863b3f40bad0d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/debian/changelog b/debian/changelog
index 86e0dd6863707dbceb4aa6dd3ee8edef8a9fbdbd..dda10e3a41820c42ef8023337ebcf87353a7da2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ctsim (4.5.4-1) unstable; urgency=low
+
+  * New upstrea
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 10 Sep 2007 02:18:54 -0600
+
 ctsim (4.5.3-3) unstable; urgency=low
 
   * debian/ctsim.menu: Update to new menu structure