From 193c2a1cf1248670a332eff2f7a0a06cc944f8f8 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 5 Jun 1998 18:14:01 +0000 Subject: [PATCH] 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. --- Thanks | 12 ++++++------ configure.in | 30 +++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Thanks b/Thanks index fc366066a..fea62b568 100644 --- a/Thanks +++ b/Thanks @@ -49,6 +49,12 @@ Francine Evans Wrote the @#$@#$@% GPL'd tri-striper we use and "love". :-) +Oscar Everitt + 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 Authors of the zlib library. Used for on-the-fly compression and decompression routines. @@ -95,12 +101,6 @@ Alan Murta Created the Generic Polygon Clipping library -Oscar - 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 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 d29ba87b5..df30d5ca2 100644 --- 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 \ - ) +) -- 2.39.5