From: curt Date: Sat, 29 Dec 2001 00:38:04 +0000 (+0000) Subject: Removed metakit and zlib from the configure/build process. The X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5039c84fd0f2d2fdea3ed3a973d25d3338b04628;p=simgear.git Removed metakit and zlib from the configure/build process. The 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.) --- diff --git a/Makefile.am b/Makefile.am index c43ae674..309596aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,13 @@ -EXTRA_DIST = mksymlinks.sh acsite.m4 acconfig.h SimGear.dsp SimGear.dsw +EXTRA_DIST = \ + acsite.m4 \ + acconfig.h \ + mksymlinks.sh \ + SimGear.dsp \ + SimGear.dsw \ + metakit-2.4.2-32.tar.gz \ + zlib-1.1.3.tar.gz -SUBDIRS = simgear +SUBDIRS = simgear # # Additional all, clean, and distclean rules for additional packages. @@ -8,7 +15,7 @@ SUBDIRS = simgear # would be nice because there are then problems with make dist # -all: +old_all: @list='@subdirs@'; \ target=`echo $@`; \ for subdir in $$list; do \ @@ -23,7 +30,7 @@ all: || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done -install: +old_install: @list='@subdirs@'; \ target=`echo $@`; \ for subdir in $$list; do \ @@ -38,7 +45,7 @@ install: || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done -clean: +old_clean: @list='@subdirs@'; \ target=`echo $@`; \ for subdir in $$list; do \ @@ -53,7 +60,7 @@ clean: || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done -distclean: +old_distclean: @list='@subdirs@'; \ target=`echo $@`; \ for subdir in $$list; do \ @@ -72,7 +79,7 @@ distclean: # distclean the associated packages and include them in the dist # -dist-hook: +old_dist-hook: (cd $(top_srcdir); \ $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl --lib) pwd @@ -93,7 +100,7 @@ dist-hook: done (cd $(top_srcdir); tar cf - simgear/metakit) | \ (cd $(distdir); tar xvf -) - + # # Rule to build RPM distribution package diff --git a/README.metakit b/README.metakit index 465818e3..41ba2f59 100644 --- a/README.metakit +++ b/README.metakit @@ -1,6 +1,23 @@ -With the author's permission, SimGear now bundles MetaKit. +For your convenience (and with the author's permission) a copy of the +MetaKit source is bundled with SimGear. You must have metakit +installed before you can build SimGear. -Important build note: +- Most linux distributions have a metakit package. For linux + developers, we recommend ysou install your distributions package + rather than building from source. + +- For developers on most other platforms, you will have to build + metakit from source and install it yourself. For your convenience a + tar ball of the metakit source is included with the simgear source + distribution. Untar the metakit source, and follow the included + build and installation instructions. + +Once metakit is installed you can return to configuring and building +Simgear. + +============================================================================= + +Potentially important build note: Later on when you are linking programs with -lmk4 (i.e. FlightGear or one of it's associated programs) if you come across an error similar to the diff --git a/README.zlib b/README.zlib new file mode 100644 index 00000000..d6e870de --- /dev/null +++ b/README.zlib @@ -0,0 +1,173 @@ +For your convenience and allowed by zlib's license terms: +http://www.gzip.org/zlib/zlib_license.html a copy of the zlib source +is bundled with SimGear. You must have zlib installed before you can +build SimGear. + +- Most linux distributions have a zlib package. For linux + developers, we recommend ysou install your distributions package + rather than building from source. + +- Cygwin installs zlib automatically. + +- For developers on most other platforms, you will have to build + zlib from source and install it yourself. For your convenience a + tar ball of the zlib source is included with the simgear source + distribution. Untar the zlib source, and follow the included + build and installation instructions. + +Once zlib is installed you can return to configuring and building +Simgear. + +We now send you to the official zlib README ... + + +============================================================================= + +zlib 1.1.3 is a general purpose data compression library. All the code +is thread safe. The data format used by the zlib library +is described by RFCs (Request for Comments) 1950 to 1952 in the files +ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate +format) and rfc1952.txt (gzip format). These documents are also available in +other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html + +All functions of the compression library are documented in the file zlib.h +(volunteer to write man pages welcome, contact jloup@gzip.org). A usage +example of the library is given in the file example.c which also tests that +the library is working correctly. Another example is given in the file +minigzip.c. The compression library itself is composed of all source files +except example.c and minigzip.c. + +To compile all files and run the test program, follow the instructions +given at the top of Makefile. In short "make test; make install" +should work for most machines. For Unix: "configure; make test; make install" +For MSDOS, use one of the special makefiles such as Makefile.msc. +For VMS, use Make_vms.com or descrip.mms. + +Questions about zlib should be sent to , or to +Gilles Vollant for the Windows DLL version. +The zlib home page is http://www.cdrom.com/pub/infozip/zlib/ +The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/ +Before reporting a problem, please check those sites to verify that +you have the latest version of zlib; otherwise get the latest version and +check whether the problem still exists or not. + +Mark Nelson wrote an article about zlib for the Jan. 1997 +issue of Dr. Dobb's Journal; a copy of the article is available in +http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm + +The changes made in version 1.1.3 are documented in the file ChangeLog. +The main changes since 1.1.2 are: + +- fix "an inflate input buffer bug that shows up on rare but persistent + occasions" (Mark) +- fix gzread and gztell for concatenated .gz files (Didier Le Botlan) +- fix gzseek(..., SEEK_SET) in write mode +- fix crc check after a gzeek (Frank Faubert) +- fix miniunzip when the last entry in a zip file is itself a zip file + (J Lillge) +- add contrib/asm586 and contrib/asm686 (Brian Raiter) + See http://www.muppetlabs.com/~breadbox/software/assembly.html +- add support for Delphi 3 in contrib/delphi (Bob Dellaca) +- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) +- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) +- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) +- added a FAQ file + +plus many changes for portability. + +Unsupported third party contributions are provided in directory "contrib". + +A Java implementation of zlib is available in the Java Development Kit 1.1 +http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html +See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details. + +A Perl interface to zlib written by Paul Marquess +is in the CPAN (Comprehensive Perl Archive Network) sites, such as: +ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib* + +A Python interface to zlib written by A.M. Kuchling +is available in Python 1.5 and later versions, see +http://www.python.org/doc/lib/module-zlib.html + +A zlib binding for TCL written by Andreas Kupries +is availlable at http://www.westend.com/~kupries/doc/trf/man/man.html + +An experimental package to read and write files in .zip format, +written on top of zlib by Gilles Vollant , is +available at http://www.winimage.com/zLibDll/unzip.html +and also in the contrib/minizip directory of zlib. + + +Notes for some targets: + +- To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc + and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL + The zlib DLL support was initially done by Alessandro Iacopetti and is + now maintained by Gilles Vollant . Check the zlib DLL + home page at http://www.winimage.com/zLibDll + + From Visual Basic, you can call the DLL functions which do not take + a structure as argument: compress, uncompress and all gz* functions. + See contrib/visual-basic.txt for more information, or get + http://www.tcfb.com/dowseware/cmp-z-it.zip + +- For 64-bit Irix, deflate.c must be compiled without any optimization. + With -O, one libpng test fails. The test works in 32 bit mode (with + the -n32 compiler flag). The compiler bug has been reported to SGI. + +- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 + it works when compiled with cc. + +- on Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 + is necessary to get gzprintf working correctly. This is done by configure. + +- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works + with other compilers. Use "make test" to check your compiler. + +- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. + +- For Turbo C the small model is supported only with reduced performance to + avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3 + +- For PalmOs, see http://www.cs.uit.no/~perm/PASTA/pilot/software.html + Per Harald Myrvang + + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate + and zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; + they are too numerous to cite here. + +Copyright notice: + + (C) 1995-1998 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* +receiving lengthy legal documents to sign. The sources are provided +for free but without warranty of any kind. The library has been +entirely written by Jean-loup Gailly and Mark Adler; it does not +include third-party code. + +If you redistribute modified sources, we would appreciate that you include +in the file ChangeLog history information documenting your changes. diff --git a/acconfig.h b/acconfig.h index 05781277..c81a4a8a 100644 --- a/acconfig.h +++ b/acconfig.h @@ -184,12 +184,6 @@ /* Define if you have the wait3 system call. */ #undef HAVE_WAIT3 -/* Define if you have gdbm installed system wide. */ -/* #undef HAVE_GDBM */ - -/* 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 diff --git a/configure.in b/configure.in index 03ceaa1a..17c00741 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,7 @@ if test "x$with_logging" = "xno" ; then AC_DEFINE(FG_NDEBUG) fi -dnl specify if we are building with "checker" +dnl specify if we are building with "electric fence" AC_ARG_WITH(efence, [ --with-efence Specify if we are building with "electric-fence"]) if test "x$with_efence" = "xyes" ; then @@ -74,7 +74,7 @@ fi dnl Check for MS Windows environment AC_CHECK_HEADER(windows.h) -if test "$HOSTTYPE" != "macintosh" ; then +if test "x$HOSTTYPE" != "xmacintosh" ; then dnl extra library and include directories EXTRA_DIRS="/usr/local /usr/local/plib /usr/X11R6" @@ -103,7 +103,7 @@ dnl Enable serial support on Unix type systems AM_CONDITIONAL(ENABLE_UNIX_SERIAL, true) dnl X11 might be installed on Mac OS X, don't want to use it if it is. -if test "$HOSTTYPE" != "macintosh" ; then +if test "x$HOSTTYPE" != "xmacintosh" ; then dnl Check for X11 (fancy) AC_PATH_XTRA fi @@ -128,7 +128,7 @@ AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a AC_CHECK_LIB(socket, socket) dnl X11 might be installed, but we don't want to use it for OSX -dw- -if test "$HOSTTYPE" != "macintosh" ; then +if test "x$HOSTTYPE" != "xmacintosh" ; then AC_CHECK_LIB(X11, XCreateWindow) AC_CHECK_LIB(Xext, XShmCreateImage) AC_CHECK_LIB(Xi, XGetExtensionVersion) @@ -140,11 +140,11 @@ fi dnl check for OpenGL related libraries -if test "$HOSTTYPE" = "macintosh" ; then +if test "x$HOSTTYPE" = "xmacintosh" ; then dnl Macintosh OSX LIBS="$LIBS -framework OpenGL -framework GLUT" elif test "x$ac_cv_header_windows_h" != "xyes" ; then - dnl Reasonable stuff for non-windoze variants ... :-) + dnl Reasonable stuff for X-Windows based machines AC_CHECK_LIB(GLcore, glNewList) if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then @@ -183,8 +183,7 @@ elif test "x$ac_cv_header_windows_h" != "xyes" ; then AC_CHECK_LIB(glut, glutGameModeString) LIBS="$save_LIBS" else - dnl Win32 is a little wierd because it has to try to handle the various - dnl winbloze-isms. We'll just do this manually for now. + dnl Win32 libs echo Win32 specific hacks... AC_DEFINE(WIN32) @@ -250,35 +249,24 @@ if test "x$ac_cv_header_plib_pu_h" != "xyes"; then exit fi -# dnl Check for system installed gdbm -# AC_CHECK_HEADER(gdbm.h) -# if test "x$ac_cv_header_gdbm_h" = "xyes"; then -# AC_DEFINE( HAVE_GDBM ) -# else -# echo "no gdbm found, configuring and building." -# fi -# AM_CONDITIONAL(HAVE_GDBM, test "x$ac_cv_header_gdbm_h" = "xyes" ) - dnl Check for system installed metakit AC_CHECK_HEADER(mk4.h) if test "x$ac_cv_header_mk4_h" != "xyes"; then - echo "no metakit found, configuring and building." - # Run configure in the metakit subdir - AC_CONFIG_SUBDIRS( simgear/metakit/unix ) + echo "Metakit not found, you will need to install this first." + echo "Please read the README.metakit for more information." + exit fi -AM_CONDITIONAL(HAVE_METAKIT, test "x$ac_cv_header_mk4_h" = "xyes" ) dnl Specify if we want logging (testing build) or not (release build) dnl Check for system installed zlib AC_CHECK_HEADER(zlib.h) -if test "x$ac_cv_header_zlib_h" = "xyes"; then - AC_DEFINE( HAVE_ZLIB ) -else - echo "no zlib found, building." +if test "x$ac_cv_header_zlib_h" != "xyes"; then + echo "zlib not found, you will need to install this first." + echo "Please read the README.zlib for more information." + exit fi -AM_CONDITIONAL(HAVE_ZLIB, test "x$ac_cv_header_zlib_h" = "xyes" ) dnl Checks for header files. AC_HEADER_STDC @@ -325,14 +313,9 @@ AC_OUTPUT( \ simgear/timing/Makefile \ simgear/xgl/Makefile \ simgear/xml/Makefile \ - simgear/zlib/Makefile \ ) -AC_OUTPUT_COMMANDS([ -# if test "x$ac_cv_header_windows_h" = "xyes" ; then -# cp simgear/gdbm/autoconf.h.cygwin32 simgear/gdbm/autoconf.h -# fi -]) +# AC_OUTPUT_COMMANDS([]) echo "" echo "Configure Summary" @@ -355,14 +338,6 @@ fi echo -n "Automake version: ($AUTO_MAKE_VERSION) " automake --version | head -1 -if test "x$ac_cv_header_mk4_h" != "xyes"; then - echo "Building metakit" -fi - -if test "x$ac_cv_header_zlib_h" != "xyes"; then - echo "Building zlib" -fi - if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then echo "Threads: pthread lib found." else diff --git a/metakit-2.4.2-32.tar.gz b/metakit-2.4.2-32.tar.gz new file mode 100644 index 00000000..b1039f33 Binary files /dev/null and b/metakit-2.4.2-32.tar.gz differ diff --git a/zlib-1.1.3.tar.gz b/zlib-1.1.3.tar.gz new file mode 100644 index 00000000..b2bcf353 Binary files /dev/null and b/zlib-1.1.3.tar.gz differ