[Lunar-commits] <moonbase> redland: Adding a CONFIGURE with adjustments to the BUILD and DEPENDS.

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Thu May 19 02:33:21 CEST 2011


commit 4aa78fb72dd821c58a45966feaf4d73ad01292bc
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed May 18 20:33:21 2011 -0400

    redland: Adding a CONFIGURE with adjustments to the BUILD and DEPENDS.
    
    The if/then for libiodbc fixes a cannot find some so files on a lunar fix.
    
    The CONFIGURE now contains some choices for the user instead of making them
    defaults.
    
    It now compiles fine if yes is said to sqlite.
---
 libs/redland/BUILD     |    8 ++++++--
 libs/redland/CONFIGURE |    4 ++++
 libs/redland/DEPENDS   |    6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/libs/redland/BUILD b/libs/redland/BUILD
index 539454d..d630377 100644
--- a/libs/redland/BUILD
+++ b/libs/redland/BUILD
@@ -1,12 +1,16 @@
 (
 
-  OPTS+=" --with-threads --with-raptor=system --without-sqlite"
+  OPTS+=" --disable-static" &&
+
+  if in_depends $MODULE libiodbc ; then
+     LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
+  fi &&
 
   if in_depends $MODULE libxml2 ; then
     OPTS+=" --with-xml-parser=libxml"
   else
     OPTS+=" --with-xml-parser=expat"
-  fi
+  fi &&
 
   default_build
 
diff --git a/libs/redland/CONFIGURE b/libs/redland/CONFIGURE
new file mode 100644
index 0000000..0f2eabb
--- /dev/null
+++ b/libs/redland/CONFIGURE
@@ -0,0 +1,4 @@
+mquery ENABLE_OPTIMIZE "Turn on optimizations?" y "--enable-release" "--disable-release"
+mquery ENABLE_DOC "Build html documentation?" n "-enable-gtk-doc-html" "--disable-gtk-doc-html"
+mquery ENABLE_THREADS "Enable threads?" y "--with-threads" "--without-threads"
+
diff --git a/libs/redland/DEPENDS b/libs/redland/DEPENDS
index c1ef80e..cfcca4c 100644
--- a/libs/redland/DEPENDS
+++ b/libs/redland/DEPENDS
@@ -3,5 +3,9 @@ depends rasqal
 optional_depends "db"           "--with-bdb"        "--without-bdb"        "for Berkley DB database support"
 optional_depends "mysql"        "--with-mysql"      "--without-mysql"      "for MySql database support"
 optional_depends "postgresql"   "--with-postgresql" "--without-postgresql" "for Postgresql database support"
-#optional_depends "sqlite"       "--with-sqlite"     "--without-sqlite"     "for SqLite database support"
+optional_depends "sqlite"       "--with-sqlite"     "--without-sqlite"     "for SqLite database support"
+optional_depends "virtuoso"     "--with-virtuoso"   "--without-virtuoso"   "for virtuoso database support"
+optional_depends "libiodbc"     "--with-iodbc"      "--without-iodbc"      "for Independent Open DataBase Connectivity support"
+optional_depends "unixODBC"     "--with-unixodbc"   "--without-unixodbc"   "for unix stype ODBC support"
 optional_depends "%XMLRENDERER" ""                  ""                     "for XML support"
+


More information about the Lunar-commits mailing list