Working on separating GPC.

diff --git a/acconfig.h b/acconfig.h
index 04cef51ebfa99d0ec33538dd5b01e4be9d443f54..98c86342d10f19709abeaeff1f42fcd06064618c 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -83,6 +83,9 @@
 /* Define if you have the getmntent function.  */
 #undef HAVE_GETMNTENT
 
+/* Define if you have the gpc library and headers installed.  */
+#undef HAVE_GPC_H
+
 /* Define if the `long double' type works.  */
 #undef HAVE_LONG_DOUBLE
 

diff --git a/configure.in b/configure.in
index 09edfd6de902b49c99152d74e242d9523b7c0e6e..8856878333627f3db5dc22f7efffea7697a25692 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -245,6 +245,20 @@ AC_SUBST(base_LIBS)
 AC_SUBST(opengl_LIBS)
 
 
+dnl Check if Generic Polygon Clipping library is installed
+dnl (from http://www.cs.man.ac.uk/aig/staff/alan/software/)
+AC_CHECK_HEADERS( gpc.h )
+if test "x$ac_cv_header_windows_h" != "xyes"; then
+    echo
+    echo "You need to have the GPC library installed on your system to build"
+    echo "the scenery generation tools, otherwise, the build will fail."
+    echo
+    echo "You can get the library from:"
+    echo 
+    echo "    http://www.cs.man.ac.uk/aig/staff/alan/software/"
+    echo
+fi
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
@@ -275,7 +289,6 @@ AC_OUTPUT( \
        Lib/Audio/example/Makefile \
        Lib/Bucket/Makefile \
        Lib/Debug/Makefile \
-       Lib/DEM/Makefile \
        Lib/Math/Makefile \
        Lib/Misc/Makefile \
        Lib/PUI/Makefile \
@@ -306,6 +319,7 @@ AC_OUTPUT( \
        Tools/Makefile \
        Tools/Areas/Makefile \
        Tools/AssemTris/Makefile \
+       Tools/DEM/Makefile \
        Tools/Dem2node/Makefile \
        Tools/DemInfo/Makefile \
        Tools/DemRaw2ascii/Makefile \