X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure;h=aa8a670e3b294977193bb9adefc01519ce318037;hb=98f57d3adc542bb7753434ce31c92a6680bd6244;hp=fd93db24ec92e9b72b89a6c407280fa06d3fea77;hpb=6644d6564f4fad97d6d0d488abdd2b37ccba79cb;p=ctsim.git

diff --git a/configure b/configure
index fd93db2..aa8a670 100755
--- a/configure
+++ b/configure
@@ -1491,7 +1491,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=3.7.0
+VERSION=4.0.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -6044,7 +6044,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_wx_mac_2_4_main" >&5
 echo "${ECHO_T}$ac_cv_lib_wx_mac_2_4_main" >&6
 if test $ac_cv_lib_wx_mac_2_4_main = yes; then
-  wxwin=true; wx_gtk=true;
+  wxwin=true; wx_mac=true;
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_WXWINDOWS 1
 _ACEOF
@@ -9219,9 +9219,14 @@ _ACEOF
 echo "${ECHO_T}yes" >&6
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   if test "$libgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
+    # Removed "-lglut" for Mac OS X compilation
+    ctlib_graphics="$ctlib_graphics -lGL -lGLU"
     if test "$wxwin" = "true" ; then
-      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
+      if  "$wx_gtk" ; then
+        ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
+      elif  "$wx_mac" ; then
+        ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
+      fi
     fi
   fi
   if test "$wxwin" = "true" ; then
@@ -9435,12 +9440,12 @@ echo "${ECHO_T}Using efence" >&6
 fi
 
 if test "$wxwin" = "true" ; then
-  if test "$wx_gtk" = "true" ; then
+  if  "$wx_gtk" = "true"  ||  "$wx_mac" == "true"  ; then
     wxcflags=`$wxconfig --cflags`
     wxlibs=`$wxconfig --libs`
   else
 	wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
-   wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
+        wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
   fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
   ctlib_graphics="$ctlib_graphics $wxlibs"