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
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
echo "$as_me:$LINENO: checking sstream" >&5
echo $ECHO_N "checking sstream... $ECHO_C" >&6
if test -f /usr/include/sstream || test -f /usr/include/g++/sstream ||
- test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ; then
+ test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ||
+ test -f /usr/include/gcc/darwin/3.1/g++-v3/sstream ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_SSTREAM 1
_ACEOF
LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+ my_includes="$my_includes -I/usr/X11R6/include"
ctlib_graphics="$ctlibs_base -lctgraphics"
echo "$as_me:$LINENO: result: yes" >&5
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
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"