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

Removed metakit and zlib from the configure/build process. The

Browse Source 
developer will need to build and install these separately if they don't
have packages already installed by their system.  See README.metakit and
README.zlib for more details.

As a convenience, pristine tarballs of the metakit and zlib source code
trees are included with the simgear distribution (and cvs.)
This commit is contained in:
curt 2001-12-29 00:35:34 +00:00
parent 45d3e19c38
commit 220a43bf46
8 changed files with 8 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
simgear/Makefile.am
View File

@ -4,18 +4,6 @@ else
SERIAL_DIRS = SERIAL_DIRS =
endif endif
# if HAVE_GDBM
# GDBM_DIRS =
# else
# GDBM_DIRS = gdbm
# endif
if HAVE_ZLIB
ZLIB_DIRS =
else
ZLIB_DIRS = zlib
endif
if HAVE_THREADS if HAVE_THREADS
SGTHREAD_DIR = threads SGTHREAD_DIR = threads
else else
@ -31,7 +19,6 @@ include_HEADERS = \
compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
SUBDIRS = \ SUBDIRS = \
$(ZLIB_DIRS) \
xml \ xml \
debug \ debug \
misc \ misc \

7
simgear/io/lowlevel.hxx
View File

@ -29,12 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include <zlib.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#else
# include <simgear/zlib/zlib.h>
#endif
#include <plib/sg.h> #include <plib/sg.h>

10
simgear/math/Makefile.am
View File

@ -1,11 +1,5 @@
includedir = @includedir@/math includedir = @includedir@/math
if HAVE_ZLIB
ZLIB_INCL =
else
ZLIB_INCL = -I$(top_srcdir)/src/zlib
endif
lib_LIBRARIES = libsgmath.a lib_LIBRARIES = libsgmath.a
include_HEADERS = \ include_HEADERS = \
@ -31,7 +25,7 @@ libsgmath_a_SOURCES = \
vector.cxx vector.cxx
if OLD_AUTOMAKE if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) $(ZLIB_INCL) INCLUDES += -I$(top_srcdir)
else else
INCLUDES = -I$(top_srcdir) $(ZLIB_INCL) INCLUDES = -I$(top_srcdir)
endif endif

10
simgear/misc/Makefile.am
View File

@ -1,11 +1,5 @@
includedir = @includedir@/misc includedir = @includedir@/misc
if HAVE_ZLIB
ZLIB_INCL =
else
ZLIB_INCL = -I$(top_srcdir)/src/zlib
endif
lib_LIBRARIES = libsgmisc.a lib_LIBRARIES = libsgmisc.a
include_HEADERS = \ include_HEADERS = \
@ -36,7 +30,7 @@ props_test_SOURCES = props_test.cxx
props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
if OLD_AUTOMAKE if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) $(ZLIB_INCL) INCLUDES += -I$(top_srcdir)
else else
INCLUDES = -I$(top_srcdir) $(ZLIB_INCL) INCLUDES = -I$(top_srcdir)
endif endif

6
simgear/misc/zfstream.hxx
View File

@ -30,11 +30,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#ifdef HAVE_ZLIB #include <zlib.h>
# include <zlib.h>
#else
# include <simgear/zlib/zlib.h>
#endif
// At least Irix needs this // At least Irix needs this
#ifdef SG_HAVE_NATIVE_SGI_COMPILERS #ifdef SG_HAVE_NATIVE_SGI_COMPILERS

4
simgear/sg_zlib.h
View File

@ -61,11 +61,7 @@
#define sgclose(F) (fclose((F))) #define sgclose(F) (fclose((F)))
#else #else
#ifdef HAVE_ZLIB
#include <zlib.h> #include <zlib.h>
#else
#include <simgear/zlib/zlib.h>
#endif
#define sgFile gzFile #define sgFile gzFile

3
simgear/simgear_config.h.in
View File

@ -50,9 +50,6 @@
/* Define if you have the vprintf function. */ /* Define if you have the vprintf function. */
#undef HAVE_VPRINTF #undef HAVE_VPRINTF
/* Define if you have zlib installed system wide. */
#undef HAVE_ZLIB
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE #undef RETSIGTYPE

10
simgear/xml/Makefile.am
View File

@ -1,11 +1,5 @@
includedir = @includedir@/xml includedir = @includedir@/xml
if HAVE_ZLIB
ZLIB_INCL =
else
ZLIB_INCL = -I$(top_srcdir)/src/zlib
endif
lib_LIBRARIES = libsgxml.a lib_LIBRARIES = libsgxml.a
include_HEADERS = \ include_HEADERS = \
@ -25,7 +19,7 @@ libsgxml_a_SOURCES = \
xmltok_impl.h xmltok_impl.h
if OLD_AUTOMAKE if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) $(ZLIB_INCL) INCLUDES += -I$(top_srcdir)
else else
INCLUDES = -I$(top_srcdir) $(ZLIB_INCL) INCLUDES = -I$(top_srcdir)
endif endif