Summary for sxemacs--main--22.1.9--patch-141

[Steve Youngs <steve@xxxxxxxxxxx>]

Location: steve@xxxxxxxxxxxxxxxxx http://arch.sxemacs.org/2008/

Revision: sxemacs--main--22.1.9--patch-141
Archive: steve@xxxxxxxxxxxxxxxxx
Creator: Steve Youngs <steve@xxxxxxxxxxx>
Date: Mon Jun  2 08:53:20 EST 2008
Standard-date: 2008-06-01 22:53:20 GMT
Modified-files: configure.ac src/database.c
New-patches: njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.9--patch-178
    njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.9--patch-179
    steve@xxxxxxxxxxxxxxxxx/sxemacs--main--22.1.9--patch-141
Summary: Merged from njsf (patch 178-179) -- build fix MacOS
Keywords: merge, bugfix, build/compile, internal

Patches applied:

 * njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.9--patch-178
   Fix berkdb compile in MacOS

 * njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.9--patch-179
   Small correction to DB_UNKNOWN check

* added files

    
{arch}/sxemacs/sxemacs--main/sxemacs--main--22.1.9/steve@xxxxxxxxxxxxxxxxx/patch-log/patch-141
    
{arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.9/njsf@xxxxxxxxxxxxxxxxx/patch-log/patch-178
    
{arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.9/njsf@xxxxxxxxxxxxxxxxx/patch-log/patch-179

* modified files

--- orig/configure.ac
+++ mod/configure.ac
@@ -3741,6 +3741,19 @@
        else
                have_database_berkdb=no
        fi
+       if test "$have_database_berkdb" = "yes"; then
+               AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+#include DB_H_FILE
+main() {
+       int type = DB_UNKNOWN;
+       return 0;
+}
+               ]])], have_db_unknown=yes)
+               if test "$have_db_unknown" = "yes" ; then
+                       AC_DEFINE_UNQUOTED([HAVE_DB_UNKNOWN], [1],
+                               [Berkley DB has DB_UNKNOWN type])
+               fi
+       fi
 fi
 
 if test "$have_database_gdbm $have_database_dbm $have_database_berkdb" \


--- orig/src/database.c
+++ mod/src/database.c
@@ -375,7 +375,9 @@
        case DB_QUEUE:
                return Qqueue;
 #endif
+#ifdef HAVE_DB_UNKNOWN
        case DB_UNKNOWN:
+#endif
        default:
                return Qunknown;
        }