Changeset 26772

Timestamp:

2013-01-21T23:38:17+13:00 (11 years ago)

Author:

davidb

Message:

Updated configure.in which separates test for bcopy and bcmp. Previously if the test for bcopy was OK, then assumed bcmp OK also. This wasn't the case on Android

Location:

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3

Files:

• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• systems.h (modified) (1 diff)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure

@@ -8642 +8642 @@
 
 
-for ac_func in rename ftruncate flock bcopy fsync
+
+for ac_func in rename ftruncate flock bcopy bcmp fsync
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure.in

@@ -24 +24 @@
 AC_CHECK_LIB(dbm, main)
 AC_CHECK_LIB(ndbm, main)
-AC_CHECK_FUNCS([rename ftruncate flock bcopy fsync])
+AC_CHECK_FUNCS([rename ftruncate flock bcopy bcmp fsync])
 AC_REPLACE_FUNCS(getopt)
 AC_TYPE_OFF_T

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/systems.h

@@ -137 +137 @@
 #include <memory.h>
 #endif
+#define bcopy(d1, d2, n) memcpy(d2, d1, n)
+#endif
+
+/* Do we have bcmp?  */
+#if !HAVE_BCMP
+#if HAVE_MEMORY_H
+#include <memory.h>
+#endif
 #define bcmp(d1, d2, n) memcmp(d1, d2, n)
-#define bcopy(d1, d2, n) memcpy(d2, d1, n)
 #endif