diff --git a/Lib/Makefile.am b/Lib/Makefile.am index a0bdf9327..840df71f1 100644 --- a/Lib/Makefile.am +++ b/Lib/Makefile.am @@ -11,5 +11,4 @@ SUBDIRS = \ Misc \ $(SERIAL_DIRS) \ XGL\ - plib \ zlib diff --git a/Simulator/GUI/gui.h b/Simulator/GUI/gui.h index dd711e7a6..0bfa9de50 100644 --- a/Simulator/GUI/gui.h +++ b/Simulator/GUI/gui.h @@ -25,7 +25,7 @@ #ifndef _GUI_H_ #define _GUI_H_ -#include <pu.h> +#include <plib/pu.h> extern puMenuBar *mainMenuBar; extern puButton *hideMenuButton; diff --git a/Simulator/Main/GLUTkey.cxx b/Simulator/Main/GLUTkey.cxx index ecab98f2e..ef3ada9f4 100644 --- a/Simulator/Main/GLUTkey.cxx +++ b/Simulator/Main/GLUTkey.cxx @@ -48,7 +48,7 @@ #include <GUI/gui.h> #include <Include/fg_constants.h> #include <Objects/material.hxx> -#include <pu.h> +#include <plib/pu.h> #include <Time/light.hxx> #include <Weather/weather.hxx> diff --git a/Simulator/Main/GLUTmain.cxx b/Simulator/Main/GLUTmain.cxx index 8e561e2a2..ab471a7e5 100644 --- a/Simulator/Main/GLUTmain.cxx +++ b/Simulator/Main/GLUTmain.cxx @@ -59,8 +59,8 @@ #include <Astro/solarsystem.hxx> #ifdef ENABLE_AUDIO_SUPPORT -# include <sl.h> -# include <sm.h> +# include <plib/sl.h> +# include <plib/sm.h> #endif #include <Autopilot/autopilot.hxx> @@ -71,7 +71,7 @@ #include <Math/mat3.h> #include <Math/polar3d.hxx> #include <Math/fg_random.h> -#include <pu.h> +#include <plib/pu.h> #include <Scenery/scenery.hxx> #include <Scenery/tilemgr.hxx> #include <Time/event.hxx> diff --git a/configure.in b/configure.in index 2968f89a1..da528a3e0 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl AM_MAINTAINER_MODE dnl This is needed for AC_TRY_COMPILE later dnl AC_ISC_POSIX -dnl Check to see if this `configure' is being run in the `Cygwin32' environment +dnl Check to see if this `configure' is being run in the `Cygwin32' environmentplib-1.0_fgfs_a.tar.gz dnl AM_CYGWIN32 dnl Specify if we want logging (testing build) or not (release build) @@ -63,6 +63,26 @@ dnl Let the Win32 user specify if they want to build with the SGI dnl opengl.dll as opposed to the more standard openg32.dll AC_ARG_WITH(sgi-opengl, [ --with-sgi-opengl Build against SGI's opengl.dll glu.dll and glut.dll]) +dnl Check for "plib" without which we cannot go on +AC_CHECK_HEADER(plib/pu.h) +if test "x$ac_cv_header_plib_pu_h" != "xyes"; then + echo + echo "You *must* have the plib library installed on your system to build" + echo "the FGFS simulator!" + echo + echo "You can get the original library from:" + echo + echo " http://www.woodsoup.org/projs/plib" + echo + echo "However, I recommend you grab a copy with a couple modifications I" + echo "have made which should eliminate a few plib-1.0 build problems:" + echo + echo " ftp://ftp.flightgear.org/pub/fgfs/Source/plib-1.0_fgfs_a.tar.gz" + echo + echo "configure aborted." + exit +fi + dnl Check for MS Windows environment AC_CHECK_HEADER(windows.h) @@ -348,6 +368,7 @@ AC_OUTPUT( \ Tools/Construct/Clipper/Makefile \ Tools/Construct/Combine/Makefile \ Tools/Construct/GenOutput/Makefile \ + Tools/Construct/Match/Makefile \ Tools/Construct/Triangulate/Makefile \ Tools/Construct/Main/Makefile \ Tools/Lib/Makefile \