FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates.

Browse Source
This commit is contained in:
curt 2000-02-19 02:22:47 +00:00
parent 41fc1621b1
commit 35ed10e252
7 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,4 +1,4 @@
EXTRA_DIST = mksymlinks.sh
EXTRA_DIST = mksymlinks.sh acsite.m4 acconfig.h
dist-hook:
tar cf - src/metar | (cd $(distdir); tar xvf -)

3
acconfig.h
View File

@ -181,6 +181,9 @@
/* Define if you have the wait3 system call. */
#undef HAVE_WAIT3
/* Define if you have zlib installed system wide. */
#undef HAVE_ZLIB
/* Define as __inline if that's what the C compiler calls it. */
#undef inline

6
configure.in
View File

@ -6,7 +6,7 @@ dnl $Id$
AC_INIT(src/bucket/newbucket.cxx)
dnl Initialize the automake stuff
AM_INIT_AUTOMAKE(SimGear, 0.0.2)
AM_INIT_AUTOMAKE(SimGear, 0.0.3)
dnl Checks for programs.
AC_PROG_MAKE_SET
@ -198,7 +198,9 @@ fi
dnl Check for system installed zlib
AC_CHECK_HEADER(zlib.h)
if test "x$ac_cv_header_zlib_h" != "xyes"; then
if test "x$ac_cv_header_zlib_h" = "xyes"; then
AC_DEFINE( HAVE_ZLIB )
else
echo "no zlib found, building."
fi
AM_CONDITIONAL(HAVE_ZLIB, test "x$ac_cv_header_zlib_h" = "xyes" )

3
mksymlinks.sh
View File

@ -37,3 +37,6 @@ ln -s ../../misc/fgstream.hxx src/simgear/misc/fgstream.hxx
ln -s ../../misc/zfstream.hxx src/simgear/misc/zfstream.hxx
ln -s ../../xgl/xgl.h src/simgear/xgl/xgl.h
ln -s ../../zlib/zlib.h src/simgear/zlib/zlib.h
ln -s ../../zlib/zconf.h src/simgear/zlib/zconf.h

8
simgear/math/Makefile.am
View File

@ -1,5 +1,11 @@
includedir = @includedir@/math
if HAVE_ZLIB
ZLIB_INCL =
else
ZLIB_INCL = -I$(top_builddir)/src/zlib
endif
lib_LIBRARIES = libsgmath.a
include_HEADERS = \
@ -29,4 +35,4 @@ libsgmath_a_SOURCES = \
polar3d.cxx \
vector.cxx
INCLUDES += -I$(top_builddir)/src
INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)

4
simgear/misc/Makefile.am
View File

@ -3,7 +3,7 @@ includedir = @includedir@/misc
if HAVE_ZLIB
ZLIB_INCL =
else
ZLIB_INCL = -I$(top_builddir)/zlib
ZLIB_INCL = -I$(top_builddir)/src/zlib
endif
lib_LIBRARIES = libsgmisc.a
@ -23,4 +23,4 @@ libsgmisc_a_SOURCES = \
texcoord.cxx \
zfstream.cxx
INCLUDES += -I$(top_builddir)/src
INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)

6
simgear/misc/zfstream.hxx
View File

@ -26,7 +26,11 @@
#include <simgear/compiler.h>
#include <zlib.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#else
# include <simgear/zlib/zlib.h>
#endif
#ifdef FG_HAVE_STD_INCLUDES