[Libreoffice-commits] .: 2 commits - configure.in pyuno/source

[Lionel Elie Mamane]

 configure.in                         |   24 ++++++++----------------
 pyuno/source/module/pyuno_module.cxx |    9 +++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 0c3409364bfa52fda57818c69a800189237c9537
Author: Lionel Elie Mamane <lionel.mamane at gestman.lu>
Date:   Wed Aug 17 18:04:32 2011 +0200

    TMP_LIONEL_NOTES

diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 4788a2f..1bada6d 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -75,6 +75,14 @@ namespace {
 /**
    @ index of the next to be used member in the initializer list !
  */
+// LEM TODO: export member names as keyword arguments in initialiser?
+// Python supports very flexible variadic functions. By marking
+// variables with one asterisk (e.g. *var) the given variable is
+// defined to be a tuple of all the extra arguments. By marking
+// variables with two asterisks (e.g. **var) the given variable is a
+// dictionary of all extra keyword arguments; the keys are strings,
+// which are the names that were used to identify the arguments. If
+// they exist, these arguments must be the last one in the list.
 sal_Int32 fillStructWithInitializer(
     const Reference< XInvocation2 > &inv,
     typelib_CompoundTypeDescription *pCompType,
@@ -90,6 +98,7 @@ sal_Int32 fillStructWithInitializer(
     int i;
     for( i = 0 ; i < pCompType->nMembers ; i ++ )
     {
+        // LEM TODO: and if too many? Silently ignored?
         if( i + nIndex >= nTupleSize )
         {
             OUStringBuffer buf;
commit d6ed363c0bc98525c4f1fe8bd5e90d5af457d0fd
Author: Lionel Elie Mamane <lionel.mamane at gestman.lu>
Date:   Wed Aug 17 18:02:58 2011 +0200

    Overhaul BerkeleyDB detection logic
    
     - use first/newest (not last/oldest) Berkeley DB found
     - link against same version than header used

diff --git a/configure.in b/configure.in
index 81cb9a8..0b8e375 100755
--- a/configure.in
+++ b/configure.in
@@ -4811,16 +4811,16 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
     for dbver in 5.1 5.0 5 4.8 4.7 4; do
         for dash in - ''; do
             AC_CHECK_HEADER([db$dash$dbver/db.h],
-                [ db_header="db$dash$dbver/db.h"; break ])
+                [ db_header="db$dash$dbver/db.h"; break 2 ])
         done
     done
 
     if test -z "$db_header"; then
-        AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'])
+        AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'; dbver=''])
     fi
 
     if test -z "$db_header"; then
-       AC_CHECK_HEADER(db.h, [ db_header='db.h' ])
+       AC_CHECK_HEADER(db.h, [ db_header='db.h'; dbver='' ])
     fi
 
     if test -z "$db_header"; then
@@ -4836,21 +4836,13 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
     SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
 
     DB_LIB=
-    for dbver in 5.1 5.0 5 4.8 4.7 4 ''; do
-        for dash in - ''; do
-            AC_CHECK_LIB(db$dash$dbver, dbopen,
-                [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-            AC_CHECK_LIB(db$dash$dbver, __db185_open,
-                [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-        done
-        test -n "$DB_LIB" && break
+    for dash in - ''; do
+        AC_CHECK_LIB(db$dash$dbver, dbopen,
+            [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
+        AC_CHECK_LIB(db$dash$dbver, __db185_open,
+            [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
     done
 
-    if test -z "$DB_LIB"; then
-        AC_CHECK_LIB(db, dbopen,
-            [ DB_LIB="db"; DB_CPPLIB="db_cxx" ])
-    fi
-
     if test -z "$DB_LIB" ; then
         AC_MSG_ERROR([db library not found. Use the correct -L flag,
 or install the Berkeley db development package.])