X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Fconfigure.in;h=d68a287285fb8067506cd9ad8f0a05a3c15c54ba;hb=48bcbd11180a2bde2122f774e411f938ff85e1a6;hp=8438d415c6ec65041c724a736d3508f28a4152a5;hpb=339c9999dbd2afb4cbd14af8f4b49ea1b7838fa3;p=citadel.git

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index 8438d415c..d68a28728 100755
--- a/libcitadel/configure.in
+++ b/libcitadel/configure.in
@@ -4,26 +4,20 @@ dnl
 
 dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
 AC_PREREQ(2.52)
-
-AC_INIT(libcitadel, 2.8.11, http://uncensored.citadel.org)
-
+AC_INIT([libcitadel], m4_esyscmd_s([grep LIBCITADEL_VERSION lib/libcitadel.h | sed 's/[^0-9]*//g' ]),[http://uncensored.citadel.org])
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)
-AC_CONFIG_SRCDIR(tests/Makefile.in)
 
 dnl
-dnl Increment LIBREVISION if source code has changed at all
+dnl Set LIBREVISION to the ever-ascending libcitadel version number.
 dnl
-dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0
+dnl If the API has changed, increment LIBCURRENT.
 dnl
-dnl If the API changes compatibly (i.e. simply adding a new function
-dnl without changing or removing earlier interfaces), then increment LIBAGE.
-dnl 
-dnl If the API changes incompatibly set LIBAGE back to 0
+dnl Set LIBAGE to 0.
 dnl
 
-LIBCURRENT=2
-LIBREVISION=811
+LIBCURRENT=4
+LIBREVISION=m4_esyscmd_s([grep LIBCITADEL_VERSION lib/libcitadel.h | sed 's/[^0-9]*//g' ])
 LIBAGE=0
 
 sinclude(conftools/libtool.m4)
@@ -103,6 +97,36 @@ AC_TRY_COMPILE([
 		]
 )
 
+AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) 
+AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <fcntl.h>
+#include <sys/types.h>
+
+#include "lib/libcitadel.h"
+],
+[
+	char foo[22];
+	memcpy(foo, HKEY("foo"));
+	
+],
+		[
+
+		  AC_MSG_RESULT([yes])
+		],
+		[ 
+		  AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy])
+		  AC_MSG_RESULT([no])
+		]
+)
+
 
 AC_CHECK_HEADERS(iconv.h)
 
@@ -197,7 +221,7 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 AC_CHECK_FUNCS(memmove bcopy)
 
-AC_CONFIG_FILES(Makefile libcitadel.pc tests/Makefile)
+AC_CONFIG_FILES(Makefile libcitadel.pc)
 AC_CONFIG_HEADER(sysdep.h)
 AC_OUTPUT