From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 5 Jun 2000 01:32:32 +0000 (+0000)
Subject: r67: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~950
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=61a66c46fb3b7ed0d22b27bf08c2d7adf418ce62

r67: *** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index a2d7527..60c1f4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.5.4 - 6/4/2000
+   Simpilifed endian handling
+	
 0.5.4-b3 - 6/1/2000
    Added support for 64-bit (IA64) CPU
    Removed broken B-spline interpolation
diff --git a/INSTALL b/INSTALL
index 793157f..5431237 100644
--- a/INSTALL
+++ b/INSTALL
@@ -28,7 +28,6 @@ CTSim Specific Configuration Help
   --enable-verbose-warnings
                           Enable verbose compiler warnings.
   --enable-debug          Turn on debugging
-  --with-png[=PATH]       Set path of lib PNG installation 
   --with-lam[=PATH]       Set path of LAM MPI 
   --with-cgibin-dir=PATH  Set path of CGI binaries directory 
   --with-cgibin-url=PATH  Set URL path of CGI binaries 
diff --git a/configure.in b/configure.in
index b2c19d8..26cbf80 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
-IZEOFdnl Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctrec.c)
-AM_INIT_AUTOMAKE(ctsim,0.5.4-b3)
+AM_INIT_AUTOMAKE(ctsim,0.5.4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -21,7 +21,6 @@ dnl AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],     AC_MSG_RESULT(yes)
 
 dnl Check for C operation
 AC_CANONICAL_HOST 
-AC_C_BIGENDIAN
 AC_C_INLINE
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int, 4)
@@ -29,38 +28,61 @@ AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 
-AC_MSG_CHECKING(endian)
-
-case "$host_cpu" in
-i386* | i486* | i586* | i686* | vax*) 
-   endian=low 
-   CFLAGS="$CFLAGS -DENDIAN_LOW=1 -DENDIAN_HIGH=0"
-   AC_MSG_RESULT(low) 
-   ;;
-sparc*  | mot* | ia64*) 
-  endian=high 
-   CFLAGS="$CFLAGS -DENDIAN_LOW=0 -DENDIAN_HIGH=1"
-  AC_MSG_RESULT(high) 
-  ;;
-*) 
-  AC_MSG_WARN([Unknown host cpu $host_cpu. Can't set endian])
-  ;;
-esac
+dnl ---------------------------------------------------------------------------
+dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
+dnl from wxGTK (www.wxwindows.org) - LGPL license
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(WX_C_BIGENDIAN,
+[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
+[ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/param.h>], [
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/param.h>], [
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
+if test $ac_cv_c_bigendian = unknown; then
+AC_TRY_RUN([main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes, ac_cv_c_bigendian=unknown)
+fi])
+if test $ac_cv_c_bigendian = unknown; then
+  AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" 
+to config.cache file])
+fi
+if test $ac_cv_c_bigendian = yes; then
+  AC_DEFINE(WORDS_BIGENDIAN)
+fi
+])
+
+WX_C_BIGENDIAN
+
 
 dnl Checks for libraries.
-AC_CHECK_LIB(z, main, 
-[
-  zlib="true"
-],
-[ 
-  zlib="false"
-  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])
-])
+AC_CHECK_LIB(z, main, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])
 AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(curses, main, [curses=true], [curses=false])
 AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
- 
+if test "$zlib" = "true" ; then
+  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
+fi
+AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true], [wxwin=false])
+AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true], [wxwin=false])
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h)
@@ -127,58 +149,6 @@ AC_ARG_ENABLE(debug,
 esac],[debug=false])
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
-dnl Set PNG directory     
-AC_MSG_CHECKING([for PNG library installation])
-AC_ARG_WITH(png,
-[  --with-png[=PATH]       Set path of lib PNG installation ],
-[
-     if test "$withval" != "no" ; then
-         trypngdir=$withval
-         if test "$prefix" != "NONE" ; then
-         trypngdir="$trypngdir $prefix"
-       fi
-     fi
-]
-)
-
-if test "$withval" != "no" -a "$zlib" = "true" ; then
-  for testpngdir in "." $trypngdir /usr/local /usr /opt ; do
-    if test -f "$testpngdir/lib/libpng.a" ; then
-      if test ! -f "$testpngdir/include/png.h" ; then
-        AC_MSG_ERROR([PNG library found, but png.h not found. Check PNG installation])
-      else
-          grep PNG_LIBPNG_VER_STRING "$testpngdir/include/png.h" | grep 9 > /dev/null 
-          if test "$?" = "0" ; then
-            AC_MSG_ERROR([Your version of libpng in $testpngdir is too old -- please upgrade])
-          fi
-      fi
-      LDFLAGS="$LDFLAGS -L$testpngdir/lib"
-      CFLAGS="$CFLAGS -I$testpngdir/include"
-      pngdir="$testpngdir"
-      AC_DEFINE(HAVE_PNG)
-      break
-    elif test -f "$testpngdir/libpng.a" ; then
-      if test ! -f "$testpngdir/png.h" ; then
-        AC_MSG_ERROR([PNG library found, but png.h not found. Check PNG installation])
-      else
-          grep PNG_LIBPNG_VER_STRING "$testpngdir/png.h" | grep 9 > /dev/null 
-          if test "$?" = "0" ; then
-            AC_MSG_ERROR([Your version of libpng in $testpngdir is too old -- please upgrade])
-          fi
-      fi
-      LDFLAGS="$LDFLAGS -L$testpngdir"
-      CFLAGS="$CFLAGS -I$testpngdir"
-      pngdir="$testpngdir"
-      AC_DEFINE(HAVE_PNG)
-      break
-    fi
-  done
-  AC_MSG_RESULT($pngdir)
-  AM_CONDITIONAL(HAVE_PNG, test -n "$pngdir")
-else
-  AC_MSG_RESULT([no])
-fi
-
 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]       Set path of LAM MPI ],
@@ -309,9 +279,9 @@ my_includes="$my_includes -I../include -I.."
 AC_SUBST(my_includes)
 
 AC_MSG_CHECKING([interactive graphics])
-if test "x$no_x" != "xyes" ; then
-  AC_DEFINE(HAVE_SGP)
+if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_X11)
+  AC_DEFINE(HAVE_SGP)
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
   LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L/usr/X11R6/lib"
   ctlibs_base="$ctlibs_base -lezplot -lgraph $X_BASIC_LIBS $X_TOOLKIT_LIBS"
@@ -329,6 +299,9 @@ fi
 if test "$zlib" = "true" ; then
   ctlibs_base="$ctlibs_base -lz"
 fi
+if test "$png" = "true" ; then
+  ctlibs_base="$ctlibs_base -lpng"
+fi
 if test "$g2" = "true" ; then
   ctlibs_base="$ctlibs_base -lg2"
 fi