summaryrefslogtreecommitdiffstats
path: root/libraries
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2012-08-12 02:09:49 -0500
committer Robby Workman <rworkman@slackbuilds.org>2012-08-12 02:09:49 -0500
commit6721e56e579547712b3dc413b93678402815ffe5 (patch)
tree7ef9c64c1e87863d98d466f40bc9ec385f6315e5 /libraries
parenta0ed6d6429ae0b37770ee9fdcc0c1c334b262247 (diff)
downloadslackbuilds-6721e56e579547712b3dc413b93678402815ffe5.tar.gz
slackbuilds-6721e56e579547712b3dc413b93678402815ffe5.tar.xz
libraries/libspatialite: Require freexl regardless
This won't build without --enable-freexl despite the fact that --disable-freexl is a valid configure flag, so let's remove the option. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libspatialite/README15
-rw-r--r--libraries/libspatialite/libspatialite.SlackBuild9
-rw-r--r--libraries/libspatialite/slack-desc2
3 files changed, 4 insertions, 22 deletions
diff --git a/libraries/libspatialite/README b/libraries/libspatialite/README
index 6c80541bd3..9d60992083 100644
--- a/libraries/libspatialite/README
+++ b/libraries/libspatialite/README
@@ -5,17 +5,4 @@ integrated into SQLite to provide a complete and powerful Spatial DBMS
deploy an alternative open source Spatial DBMS roughly equivalent to
PostgreSQL + PostGIS.
-Required dependency:
- * SQLite 3 (http://www.sqlite.org)
-
-Recommended dependensies (enabled by default):
- * Proj.4 (http://trac.osgeo.org/proj/), available at SlackBuilds.org
- * GEOS (http://trac.osgeo.org/geos/), available at SlackBuilds.org
-
-Optional dependency (enabled by default):
- * FreeXL (https://www.gaia-gis.it/FreeXL/)
-
-If you don't want to build SpatiaLite with FreeXL support specify FREEXL=no
-to SlackBuild, for example
-
- FREEXL=no sh libspatialite.SlackBuild
+This requires proj, geos, and freexl.
diff --git a/libraries/libspatialite/libspatialite.SlackBuild b/libraries/libspatialite/libspatialite.SlackBuild
index 121d778fbe..c117f3ef32 100644
--- a/libraries/libspatialite/libspatialite.SlackBuild
+++ b/libraries/libspatialite/libspatialite.SlackBuild
@@ -23,7 +23,7 @@
PRGNAM=libspatialite
VERSION=${VERSION:-3.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -68,11 +68,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-WITHFREEXL="--enable-freexl"
-if [ "${FREEXL:-yes}" = "no" ]; then
- WITHFREEXL="--disable-freexl"
-fi
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="-ldl" \
@@ -82,7 +77,7 @@ LDFLAGS="-ldl" \
--sysconfdir=/etc \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-static \
- $WITHFREEXL \
+ --enable-freexl \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/libspatialite/slack-desc b/libraries/libspatialite/slack-desc
index 3398e3586a..578c590e86 100644
--- a/libraries/libspatialite/slack-desc
+++ b/libraries/libspatialite/slack-desc
@@ -13,7 +13,7 @@ libspatialite: core to support fully fledged Spatial SQL capabilities. SpatiaLit
libspatialite: smoothly integrated into SQLite to provide a complete and powerful
libspatialite: Spatial DBMS (mostly OGC-SFS compliant).
libspatialite:
-libspatialite:
libspatialite: Project homepage: https://www.gaia-gis.it/fossil/libspatialite/home
libspatialite:
libspatialite:
+libspatialite: