Try to avoid confusiong between libqhull io.h and mingw own io.h (fixes

OSGeo#6590)

git-svn-id: https://svn.osgeo.org/gdal/trunk@34637 f0d54148-0727-0410-94bb-9a71ac55c965

gdal/GDALmake.opt.in

@@ -297,6 +297,7 @@ GEOS_CFLAGS     =       @GEOS_CFLAGS@
 # QHull Support
 
 QHULL_SETTING   =       @QHULL_SETTING@
+QHULL_INCLUDE_SUBDIR_IS_LIBQHULL   =       @QHULL_INCLUDE_SUBDIR_IS_LIBQHULL@
 
 # GRASS Support
 

gdal/alg/GNUmakefile

@@ -29,10 +29,10 @@ CPPFLAGS 	:=	-DHAVE_ARMADILLO $(CPPFLAGS)
 endif
 
 ifeq ($(QHULL_SETTING),external)
-CPPFLAGS 	:=	-DEXTERNAL_QHULL $(CPPFLAGS)
+CPPFLAGS 	:=	-DEXTERNAL_QHULL -DQHULL_INCLUDE_SUBDIR_IS_LIBQHULL=$(QHULL_INCLUDE_SUBDIR_IS_LIBQHULL) $(CPPFLAGS)
 endif
 ifeq ($(QHULL_SETTING),internal)
-CPPFLAGS 	:=	-DINTERNAL_QHULL -Ilibqhull $(CPPFLAGS)
+CPPFLAGS 	:=	-DINTERNAL_QHULL $(CPPFLAGS)
 endif
 
 CPPFLAGS	:=	$(CPPFLAGS) $(OPENCL_FLAGS)

gdal/alg/delaunay.c

@@ -63,8 +63,16 @@ CPL_CVSID("$Id$");
 
 #else /* INTERNAL_QHULL */
 
+#if !defined(QHULL_INCLUDE_SUBDIR_IS_LIBQHULL)
 #include "libqhull.h"
 #include "qset.h"
+#elif QHULL_INCLUDE_SUBDIR_IS_LIBQHULL
+#include "libqhull/libqhull.h"
+#include "libqhull/qset.h"
+#else
+#include "qhull/libqhull.h"
+#include "qhull/qset.h"
+#endif
 
 #endif /* INTERNAL_QHULL */
 

gdal/alg/internal_qhull_headers.h

@@ -974,22 +974,22 @@ static gdal_realT qh_stddev();
 #pragma warning( disable : 4306 )  /* e.g 'type cast' : conversion from 'long' to 'facetT *' of greater size */
 #endif
 
-#include "libqhull.h"
-#include "libqhull.c"
-#include "poly.c"
-#include "poly2.c"
-#include "mem.c"
-#include "user.c"
-#include "global.c"
+#include "libqhull/libqhull.h"
+#include "libqhull/libqhull.c"
+#include "libqhull/poly.c"
+#include "libqhull/poly2.c"
+#include "libqhull/mem.c"
+#include "libqhull/user.c"
+#include "libqhull/global.c"
 /*#include "userprintf.c"*/
-#include "random.c"
-#include "qset.c"
-#include "io.c"
-#include "usermem.c"
-#include "geom.c"
-#include "geom2.c"
-#include "stat.c"
-#include "merge.c"
+#include "libqhull/random.c"
+#include "libqhull/qset.c"
+#include "libqhull/io.c"
+#include "libqhull/usermem.c"
+#include "libqhull/geom.c"
+#include "libqhull/geom2.c"
+#include "libqhull/stat.c"
+#include "libqhull/merge.c"
 
 #ifdef _MSC_VER
 #pragma warning( pop )

gdal/alg/makefile.vc

@@ -15,7 +15,7 @@ EXTRAFLAGS = $(EXTRAFLAGS) -DOGR_ENABLED
 
 !IFDEF QHULL_SETTING
 !IF "$(QHULL_SETTING)" == "INTERNAL"
-EXTRAFLAGS = $(EXTRAFLAGS) -DINTERNAL_QHULL -Ilibqhull
+EXTRAFLAGS = $(EXTRAFLAGS) -DINTERNAL_QHULL
 !ELSE
 !IF "$(QHULL_SETTING)" == "EXTERNAL"
 EXTRAFLAGS = $(EXTRAFLAGS) -DEXTERNAL_QHULL $(QHULL_INC)

gdal/configure

@@ -675,6 +675,7 @@ FREEXL_INCLUDE
 HAVE_FREEXL
 OPENCL_LIB
 OPENCL_FLAGS
+QHULL_INCLUDE_SUBDIR_IS_LIBQHULL
 QHULL_SETTING
 GEOS_CONFIG
 GEOS_VERSION
@@ -29205,11 +29206,7 @@ fi
 
     if test "$QHULL_SETTING" = "yes"; then
         QHULL_SETTING=external
-        if test -f /usr/include/qhull/libqhull.h; then
-            EXTRA_INCLUDES="-I/usr/include/qhull $EXTRA_INCLUDES"
-        else
-            EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES"
-        fi
+        QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=0
         LIBS="-lqhull $LIBS"
     fi
   fi
@@ -29270,11 +29267,7 @@ fi
 
     if test "$QHULL_SETTING" = "yes"; then
         QHULL_SETTING=external
-        if test -f /usr/include/libqhull/libqhull.h; then
-            EXTRA_INCLUDES="-I/usr/include/libqhull $EXTRA_INCLUDES"
-        else
-            EXTRA_INCLUDES="-I/usr/local/include/libqhull $EXTRA_INCLUDES"
-        fi
+        QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
         LIBS="-lqhull $LIBS"
     fi
   fi
@@ -29284,14 +29277,18 @@ fi
         as_fn_error $? "--with-qhull requested, but library not found!" "$LINENO" 5
     else
         QHULL_SETTING=internal
+        QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
     fi
   fi
 else
   QHULL_SETTING=internal
+  QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
 fi
 
 QHULL_SETTING=$QHULL_SETTING
 
+QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=$QHULL_INCLUDE_SUBDIR_IS_LIBQHULL
+
 
 
 OPENCL_SETTING=no

gdal/configure.in

@@ -3670,11 +3670,7 @@ elif test "$with_qhull" = "yes" -o "$with_qhull" = "" ; then
     AC_CHECK_LIB(qhull,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,)
     if test "$QHULL_SETTING" = "yes"; then
         QHULL_SETTING=external
-        if test -f /usr/include/qhull/libqhull.h; then
-            EXTRA_INCLUDES="-I/usr/include/qhull $EXTRA_INCLUDES"
-        else
-            EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES"
-        fi
+        QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=0
         LIBS="-lqhull $LIBS"
     fi
   fi
@@ -3683,11 +3679,7 @@ elif test "$with_qhull" = "yes" -o "$with_qhull" = "" ; then
     AC_CHECK_LIB(qhull,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,)
     if test "$QHULL_SETTING" = "yes"; then
         QHULL_SETTING=external
-        if test -f /usr/include/libqhull/libqhull.h; then
-            EXTRA_INCLUDES="-I/usr/include/libqhull $EXTRA_INCLUDES"
-        else
-            EXTRA_INCLUDES="-I/usr/local/include/libqhull $EXTRA_INCLUDES"
-        fi
+        QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
         LIBS="-lqhull $LIBS"
     fi
   fi
@@ -3697,13 +3689,16 @@ elif test "$with_qhull" = "yes" -o "$with_qhull" = "" ; then
         AC_MSG_ERROR([--with-qhull requested, but library not found!])
     else
         QHULL_SETTING=internal
+        QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
     fi
   fi
 else
   QHULL_SETTING=internal
+  QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
 fi
 
 AC_SUBST([QHULL_SETTING],$QHULL_SETTING)
+AC_SUBST([QHULL_INCLUDE_SUBDIR_IS_LIBQHULL],$QHULL_INCLUDE_SUBDIR_IS_LIBQHULL)
 
 dnl ---------------------------------------------------------------------------
 dnl Check if opencl library is available.