Fix build with jasper 2.0. Release 9
[packages/gdal.git] / gdal-pluginsdir.patch
1 --- gdal-1.11.2/gcore/gdaldrivermanager.cpp.orig        2015-02-10 13:12:08.000000000 +0100
2 +++ gdal-1.11.2/gcore/gdaldrivermanager.cpp     2015-03-01 21:11:24.537623226 +0100
3 @@ -686,12 +686,12 @@
4      }
5      else
6      {
7 -#ifdef GDAL_PREFIX
8 +#if 1
9          papszSearchPath = CSLAddString( papszSearchPath, 
10      #ifdef MACOSX_FRAMEWORK
11                                          GDAL_PREFIX "/PlugIns");
12      #else
13 -                                        GDAL_PREFIX "/lib/gdalplugins" );
14 +                                        GDAL_LIBDIR "/gdalplugins" );
15      #endif
16  #else
17          char szExecPath[1024];
18 --- gdal-1.11.2/configure.in.orig       2015-03-01 09:07:33.069445871 +0100
19 +++ gdal-1.11.2/configure.in    2015-03-01 21:13:55.727616880 +0100
20 @@ -3812,12 +3812,16 @@
21  
22  if test "$prefix" = "NONE" ; then 
23    GDAL_PREFIX=/usr/local
24 +  GDAL_LIBDIR=${GDAL_PREFIX}/lib
25  else
26    GDAL_PREFIX=${prefix}
27 +  eval eval GDAL_LIBDIR="${libdir}"
28  fi
29  
30  export GDAL_PREFIX
31 +export GDAL_LIBDIR
32  AC_DEFINE_UNQUOTED(GDAL_PREFIX,["]$GDAL_PREFIX["], [--prefix directory for GDAL install])
33 +AC_DEFINE_UNQUOTED(GDAL_LIBDIR,["]$GDAL_LIBDIR["], [--prefix directory for GDAL install])
34  
35  dnl ---------------------------------------------------------------------------
36  dnl Perl bindings.
This page took 0.045211 seconds and 3 git commands to generate.