[gdal-dev] GDAL/OGR 2.1.0 RC2 Available for Review

[Marco Atzeri]

On 21/04/2016 21:52, Even Rouault wrote:
> Hi,
>
> I've issued a new RC to fix a trunk regression in the OGR VRT driver.
>

attached patch to manage the latest location of qhull header.
(/usr/include/libqhull/libqhull.h)
It may need some adjustment but works for me on cygwin.

I also noted that local headers are looked in the the wrong directory

-            EXTRA_INCLUDES="-I/usr/include/local/qhull $EXTRA_INCLUDES"
+            EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES"

https://gcc.gnu.org/onlinedocs/gcc-5.3.0/cpp/Search-Path.html#Search-Path

The build including the perl bind is fine, but I have some
issues with the python one.

Question:
from build log I see

	echo 'GNM_ENABLED=no' >> setup_vars.ini

so why the GNM stuff is build at all ?

g++ -shared -Wl,--enable-auto-image-base -L. 
build/temp.cygwin-2.5.0-x86_64-2.7/extensions/gnm_wrap.o -L../../.libs 
-L../../ -L/usr/lib/python2.7/config -L/usr/lib 
-L/cygdrive/e/cyg_pub/devel/gdal/prova/gdal-2.1.0-1.x86_64/build/lib 
-lpython2.7 -lgdal -o build/lib.cygwin-2.5.0-x86_64-2.7/osgeo/_gnm.dll
build/temp.cygwin-2.5.0-x86_64-2.7/extensions/gnm_wrap.o: In function 
`GNMNetworkShadow_GetVersion':
/pub/devel/gdal/prova/gdal-2.1.0-1.x86_64/build/swig/python/extensions/gnm_wrap.cpp:3391: 
undefined reference to `GNMGetVersion'


 >
 > Even

Regards
Marco
-------------- next part --------------
--- origsrc/gdal-2.1.0/configure.in	2016-04-21 21:40:12.000000000 +0200
+++ src/gdal-2.1.0/configure.in	2016-04-21 22:22:20.321234800 +0200
@@ -3636,11 +3636,25 @@
         if test -f /usr/include/qhull/libqhull.h; then
             EXTRA_INCLUDES="-I/usr/include/qhull $EXTRA_INCLUDES"
         else
-            EXTRA_INCLUDES="-I/usr/include/local/qhull $EXTRA_INCLUDES"
+            EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES"
         fi
         LIBS="-lqhull $LIBS"
     fi
   fi
+  AC_CHECK_HEADERS([libqhull/libqhull.h])
+  if test "$ac_cv_header_libqhull_libqhull_h" = "yes"; 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/qhull $EXTRA_INCLUDES"
+        fi
+        LIBS="-lqhull $LIBS"
+    fi
+  fi
+
   if test "$QHULL_SETTING" = "no" ; then
     if test "$with_qhull" = "yes"; then
         AC_MSG_ERROR([--with-qhull requested, but library not found!])