r3854: new deb pkd

[ctsim.git] / configure

diff --git a/configure b/configure
index e195f596e6784b28ee247a30375398631930dce4..062ab0df4a02cee2130a20df54245b301d13dad2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1521,7 +1521,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=ctsim
- VERSION=3.7.0
+ VERSION=4.0.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5916,7 +5916,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
@@ -7169,6 +7169,70 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 
+echo "$as_me:$LINENO: checking for getopt" >&5
+echo $ECHO_N "checking for getopt... $ECHO_C" >&6
+if test "${ac_cv_func_getopt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char getopt (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getopt ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_getopt) || defined (__stub___getopt)
+choke me
+#else
+f = getopt;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_getopt=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_getopt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_getopt" >&5
+echo "${ECHO_T}$ac_cv_func_getopt" >&6
+if test $ac_cv_func_getopt = yes; then
+   getopt=true
+else
+   getopt=false
+fi
+
 
 if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
@@ -7340,11 +7404,12 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_SSTREAM 1
 _ACEOF
 
-  echo "$as_me:$LINENO: result: yes" >&5
+   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-fi
-echo "$as_me:$LINENO: result: no" >&5
+  else
+   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+ fi
 
 
 CFLAGS="$CFLAGS -Wall"
@@ -8755,9 +8820,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
@@ -8962,12 +9032,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"