| 1 |
tomjbe 12/08/27 18:37:40 |
| 2 |
|
| 3 |
Added: xastir-2.0.0-no-builtin-shapelib.diff |
| 4 |
Log: |
| 5 |
Do not builtin shapelib if sci-libs/shapelib is not installed. Build without shapelib support instead. (bug #430704). Thanks Diego. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xastir-2.0.0-no-builtin-shapelib.diff |
| 16 |
=================================================================== |
| 17 |
# Do not use builtin bundled shapelib if sci-libs/shapelib is not |
| 18 |
# installed. Drop shapelib support instead (bug #430704) |
| 19 |
--- configure.ac.orig 2012-08-27 20:17:30.000000000 +0200 |
| 20 |
+++ configure.ac 2012-08-27 20:19:32.000000000 +0200 |
| 21 |
@@ -338,24 +338,14 @@ |
| 22 |
|
| 23 |
# Check for Shapelib |
| 24 |
use_shapelib=yes |
| 25 |
-force_internal_shapelib=no |
| 26 |
shapelib_desired=yes |
| 27 |
LIBSHP="" |
| 28 |
SUBSHP="" |
| 29 |
-AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval) |
| 30 |
AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval) |
| 31 |
if test "${shapelib_desired}" = "no"; then |
| 32 |
use_shapelib=no |
| 33 |
- force_internal_shapelib=no |
| 34 |
fi |
| 35 |
-if test "${force_internal_shapelib}" = "yes"; then |
| 36 |
- AC_MSG_WARN([***************************************************************** ]) |
| 37 |
- AC_MSG_WARN([Internal Shapelib library has been forced. ]) |
| 38 |
- AC_MSG_WARN([***************************************************************** ]) |
| 39 |
- # Temporary setting to get into if block below |
| 40 |
- use_shapelib=no |
| 41 |
-fi |
| 42 |
-if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then |
| 43 |
+if test "${shapelib_desired}" = "yes" ; then |
| 44 |
use_shapelib=no |
| 45 |
AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes |
| 46 |
LIBS="$LIBS -lshp" |
| 47 |
@@ -364,21 +354,6 @@ |
| 48 |
AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) |
| 49 |
break)]) |
| 50 |
fi |
| 51 |
-if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then |
| 52 |
- AC_MSG_WARN([**************************************************************** ]) |
| 53 |
- AC_MSG_WARN([Your system does not have shapelib installed. Using an internal ]) |
| 54 |
- AC_MSG_WARN([version. This may lead to a larger filesize for the executable. ]) |
| 55 |
- AC_MSG_WARN([Install shapelib on your system to eliminate this warning. ]) |
| 56 |
- AC_MSG_WARN([**************************************************************** ]) |
| 57 |
- LIBSHP="-Lshapelib -lshape" |
| 58 |
- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS" |
| 59 |
- SUBSHP="shapelib" |
| 60 |
- use_shapelib=yes |
| 61 |
- force_internal_shapelib=yes |
| 62 |
- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) |
| 63 |
- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) |
| 64 |
- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. ) |
| 65 |
-fi |
| 66 |
AC_SUBST(SUBSHP) |
| 67 |
AC_SUBST(LIBSHP) |
Archives