r1366: *** empty log message ***

diff --git a/config.h.in b/config.h.in
index 257f9f677733c15dbe1f71738a20f94865b8885b..1a6d7b5dec0f9f9c0619c4d786b264c83d4b7721 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -67,8 +67,6 @@
 
 #undef HAVE_READLINE
 
-#undef HAVE_G2
-
 #undef HAVE_CURSES
 
 #undef HAVE_NCURSES

diff --git a/configure b/configure
index 185a2e961b68adf0f603a4b7e5702a7f06d618e8..b12e3a6a7832d799b0fe73ed25b2f534d9cf8820 100755 (executable)
--- a/configure
+++ b/configure
@@ -2090,14 +2090,14 @@ curses=false
 fi
 
 wxwin=false
-echo $ac_n "checking for main in -lwx_gtk""... $ac_c" 1>&6
-echo "configure:2095: checking for main in -lwx_gtk" >&5
-ac_lib_var=`echo wx_gtk'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lwx_gtk-2.2""... $ac_c" 1>&6
+echo "configure:2095: checking for main in -lwx_gtk-2.2" >&5
+ac_lib_var=`echo wx_gtk-2.2'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lwx_gtk  $LIBS"
+LIBS="-lwx_gtk-2.2  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2103 "configure"
 #include "confdefs.h"
@@ -4611,7 +4611,10 @@ EOF
   echo "$ac_t""yes" 1>&6
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   if test "$libgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU"
+    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
+    if test "$wxwin" = "true" ; then
+      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.2"
+    fi
   fi
   if test "$wxwin" = "true" ; then
     cat >> confdefs.h <<\EOF
@@ -4646,7 +4649,7 @@ if test "$ctn" = "true"; then
 fi
 
 echo $ac_n "checking for main in -ldmallocxx""... $ac_c" 1>&6
-echo "configure:4650: checking for main in -ldmallocxx" >&5
+echo "configure:4653: checking for main in -ldmallocxx" >&5
 ac_lib_var=`echo dmallocxx'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4654,14 +4657,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldmallocxx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4658 "configure"
+#line 4661 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4683,7 +4686,7 @@ dmallocxx=false
 fi
 
 echo $ac_n "checking for enable-dmalloc""... $ac_c" 1>&6
-echo "configure:4687: checking for enable-dmalloc" >&5
+echo "configure:4690: checking for enable-dmalloc" >&5
 # Check whether --enable-dmalloc or --disable-dmalloc was given.
 if test "${enable_dmalloc+set}" = set; then
   enableval="$enable_dmalloc"
@@ -4712,7 +4715,7 @@ EOF
 fi
 
 echo $ac_n "checking for main in -lefence""... $ac_c" 1>&6
-echo "configure:4716: checking for main in -lefence" >&5
+echo "configure:4719: checking for main in -lefence" >&5
 ac_lib_var=`echo efence'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4720,14 +4723,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lefence  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4724 "configure"
+#line 4727 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4749,7 +4752,7 @@ efence=false
 fi
 
 echo $ac_n "checking for enable-efence""... $ac_c" 1>&6
-echo "configure:4753: checking for enable-efence" >&5
+echo "configure:4756: checking for enable-efence" >&5
 # Check whether --enable-efence or --disable-efence was given.
 if test "${enable_efence+set}" = set; then
   enableval="$enable_efence"

diff --git a/configure.in b/configure.in
index 21ca5b907880e4aef3e16ea0139bede6c3a723a9..ecd8610f40dab4626df6bf3cf52249b519c3ce2c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readlin
 AC_CHECK_LIB(ncurses, main, [ncurses=true; AC_DEFINE(HAVE_NCURSES)], [ncurses=false])
 AC_CHECK_LIB(curses, main, [curses=true; AC_DEFINE(HAVE_CURSES)], [curses=false])
 wxwin=false
-AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(wx_gtk-2.2, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
 AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
@@ -352,7 +352,7 @@ if test "$no_x" != "yes" ; then
   if test "$libgl" = "true" ; then
     ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
     if test "$wxwin" = "true" ; then
-      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl"
+      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.2"
     fi
   fi
   if test "$wxwin" = "true" ; then