Updated configure.in to include a couple automake "conditionals"

This allows us to conditionally compile alternative source files and
introduce additional checks that aren't directly available within
automake.
Added Tools/DemInfo which dumps the DEM file header info.

diff --git a/Thanks b/Thanks
index fc366066ae45b154358f9606d70991f9d77552d5..fea62b568caa2d0bf744c59dbcca740f8f27beb0 100644 (file)
--- a/Thanks
+++ b/Thanks
@@ -49,6 +49,12 @@ Francine Evans <evans@cs.sunysb.edu>
   Wrote the @#$@#$@% GPL'd tri-striper we use and "love". :-)
 
 
+Oscar Everitt <bigoc@premier.net>
+  Created single engine piston engine sounds as part of an F4U package
+  for FS98.  They are pretty cool and Oscar was happy to contribute
+  them to our little project.
+
+
 Jean-loup Gailly and Mark Adler <zlib@quest.jpl.nasa.gov>
   Authors of the zlib library.  Used for on-the-fly compression and
   decompression routines.
@@ -95,12 +101,6 @@ Alan Murta <amurta@cs.man.ac.uk>
   Created the Generic Polygon Clipping library
 
 
-Oscar <bigoc@premier.net>
-  Created single engine piston engine sounds as part of an F4U package
-  for FS98.  They are pretty cool and Oscar was happy to contribute
-  them to our little project.
-
-
 Jonathan R Shewchuk <Jonathan_R_Shewchuk@ux4.sp.cs.cmu.edu>
   Author of the Triangle program.  Triangle is used to calculate the
   Delauney triangulation of our irregular terrain.

diff --git a/configure.in b/configure.in
index d29ba87b53aa4a2100d513b7e1b4bd231a2d1871..df30d5ca25f7412445778b54aa7c5ecb9109a311 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,20 +23,32 @@ AM_MAINTAINER_MODE
 dnl Check to see if this `configure' is being run in the `Cygwin32' environment
 AM_CYGWIN32
 
+dnl Using AM_CONDITIONAL is a step out of the protected little 
+dnl automake fold so it is potentially dangerous.  But, we are
+dnl beginning to run into cases where the standard checks are not
+dnl enough.  AM_CONDITIONALS are then referenced to conditionally
+dnl build a Makefile.in from a Makefile.am which lets us define custom
+dnl includes, compile alternative source files, etc.
 dnl Check for Linux style audio support
+
+AM_CONDITIONAL(HAVE_DAYLIGHT, grep daylight /usr/include/time.h )
+
+AM_CONDITIONAL(HAVE_TIMEZONE, grep timezone /usr/include/time.h )
+
 AM_CONDITIONAL(HAVE_OSS_AUDIO, \
        test -r /usr/include/soundcard.h -o -r /usr/include/linux/soundcard.h )
 
 AC_CHECK_HEADER(windows.h)
 
 dnl extra library and include directories
-if test "x$am_cv_header_windows_h" = "xyes" ; then
-    wi_EXTRA_DIRS(no, /store /usr/local /local /user/local /usr/share \
-       /usr/X11R6 /opt/X11R6 `pwd`/Win32)
-else
-    wi_EXTRA_DIRS(no, /store /usr/local /local /user/local /usr/share \
-       /usr/X11R6 /opt/X11R6)
+EXTRA_DIRS="/usr/local /usr/X11R6 /opt/X11R6"
+
+if test "x$ac_cv_header_windows_h" = "xyes" ; then
+    EXTRA_DIRS="${EXTRA_DIRS} `pwd`/Win32"
+# elif test `uname -s` = "SunOS" ; then
+#   EXTRA_DIRS="${EXTRA_DIRS} `pwd`/SunOS"
 fi
+wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
 
 dnl Check for X11 (fancy)
 AC_PATH_XTRA
@@ -53,6 +65,9 @@ AC_CHECK_LIB(SM, SmcOpenConnection)
 AC_CHECK_LIB(Xt, XtMalloc)
 AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
 
+# dnl Solaris OpenGL pain
+# AC_CHECK_LIB(eprintf, __eprintf)
+
 AC_CHECK_LIB(GLcore, glNewList)
 if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
     dnl if no GLcore, check for GL
@@ -164,6 +179,7 @@ AC_OUTPUT( \
        Tools/Makefile \
        Tools/AssemTris/Makefile \
        Tools/Dem2node/Makefile \
+       Tools/DemInfo/Makefile \
        Tools/DemRaw2ascii/Makefile \
        Tools/FixNode/Makefile \
        Tools/FixObj/Makefile \
@@ -172,4 +188,4 @@ AC_OUTPUT( \
        Tools/Tri2obj/Makefile \
        Tools/Triangle/Makefile \
        Tests/Makefile \
-       )
+)