From af4c1e40b952335944785f88a5eb2d6218507257 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 18 Jan 2006 19:20:38 +0000
Subject: [PATCH] r10879: Automated commit for Debian build of ctsim
 upstream-version-4.4.3

---
 configure         | 55 +++++++++++++++++++++++++++++++++++++++++------
 configure.ac      |  5 ++++-
 tools/Makefile.in |  2 +-
 3 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 628dd38..26506e1 100755
--- a/configure
+++ b/configure
@@ -3766,7 +3766,47 @@ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
 esac
 
 
-# Extract the first word of "wx-config", so it can be a program name with args.
+# Extract the first word of "wxgtk-2.4-config", so it can be a program name with args.
+set dummy wxgtk-2.4-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_wxconfig+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $wxconfig in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_wxconfig="$wxconfig" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_wxconfig="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+wxconfig=$ac_cv_path_wxconfig
+
+if test -n "$wxconfig"; then
+  echo "$as_me:$LINENO: result: $wxconfig" >&5
+echo "${ECHO_T}$wxconfig" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if  ! "$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
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -3805,6 +3845,7 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+fi
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
@@ -9245,7 +9286,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9272,7 +9313,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -9286,18 +9327,18 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
@@ -9335,7 +9376,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
+    if test -r $ac_dir/libX11.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
     fi
diff --git a/configure.ac b/configure.ac
index 687c010..bf2fba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,10 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_C_BIGENDIAN
 
-AC_PATH_PROG(wxconfig,wx-config)
+AC_PATH_PROG(wxconfig,wxgtk-2.4-config)
+if [ ! "$wxconfig" ]; then
+  AC_PATH_PROG(wxconfig,wx-config)
+fi
 
 dnl Check for C operation
 AC_CANONICAL_HOST 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4938eff..2e962e7 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -498,7 +498,7 @@ install-exec-hook:
 	ln -sf ctsimtext $(bindir)/pjinfo
 	ln -sf ctsimtext $(bindir)/pjrec
 	ln -sf ctsimtext $(bindir)/pjHinterp
-	ln -sf linogram $(bindir)/linogram
+	ln -sf ctsimtext $(bindir)/linogram
 
 realclean:
 	rm -f *.pgm *.if *~ *.pj
-- 
2.34.1