2009-09-01 Marcus Brinkmann <[email protected]>

	* configure.ac: Set BUILD_REVISION and update calculation of data
	for build info.  Update libtool macros.  Set NETLIBS for W32
	targets.

src/
2009-09-01  Marcus Brinkmann  <[email protected]>

	* setenv.c: Do not include "assuan-defs.h", instead redefine
	setenv, unsetenv, clearenv in place.
	* assuan-socket-server.c: Use _assuan_free instead of xfree.
	* assuan-pipe-connect.c: Fix syntax error.
	* assuan-defs.h: Remove some duplicated W32 stuff.
	* Makefile.am (libassuan_la_LIBADD, libassuan_pth_la_LIBADD): Add
	@NETLIBS@.
	* versioninfo.rc.in (FILEVERSION): Set to @BUILD_FILEVERSION@.
	("FileDescription", "FileVersion", "InternalName")
	("LegalCopyright", "OriginalFilename", "ProductName"): Replace c&p
	garbage.
	* libassuan.def: Remove assuan_get_peercred.

9 files changed, 94 insertions, 81 deletions

diff --git a/ChangeLog b/ChangeLog
index b92ffa2..72af617 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-01  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac: Set BUILD_REVISION and update calculation of data
+	for build info.  Update libtool macros.  Set NETLIBS for W32
+	targets.
+
 2009-08-26  Marcus Brinkmann  <[email protected]>
 
 	* configure.ac: Test for versioned symbols support.
diff --git a/configure.ac b/configure.ac
index 1a9ff10..381d317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ AC_SUBST(LIBASSUAN_LT_CURRENT)
 AC_SUBST(LIBASSUAN_LT_AGE)
 AC_SUBST(LIBASSUAN_LT_REVISION)
 
+BUILD_REVISION=svn_revision
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
@@ -75,10 +76,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
 
 
 # Don't default to build static libs.
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_RC
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([win32-dll disable-static])
+LT_LANG([Windows Resource])
 
 # For now we hardcode the use of version scripts.  It would be better
 # to write a test for this or even implement this within libtool.
@@ -173,8 +173,22 @@ fi
 dnl AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
 
 if test "$have_w32_system" = yes; then
-   AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
+    AC_DEFINE(HAVE_W32_SYSTEM,1,[Defined if we run on a W32 API based system])
+    BUILD_TIMESTAMP=`date --iso-8601=minutes`
+    AC_SUBST(BUILD_TIMESTAMP)
+    changequote(,)dnl 
+    BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
+    changequote([,])dnl
+    case "$VERSION" in
+      *-svn*) BUILD_FILEVERSION="${BUILD_FILEVERSION}0" ;;
+      *-cvs)  BUILD_FILEVERSION="${BUILD_FILEVERSION}0" ;;
+      *-rc*)  BUILD_FILEVERSION="${BUILD_FILEVERSION}1" ;;
+      *)      BUILD_FILEVERSION="${BUILD_FILEVERSION}2" ;;
+    esac
 fi
+AC_SUBST(BUILD_REVISION)
+AC_SUBST(BUILD_TIMESTAMP)
+AC_SUBST(BUILD_FILEVERSION)
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 
 #
@@ -189,6 +203,11 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
 	[NETLIBS="-lsocket $NETLIBS"]))
 AC_SUBST(NETLIBS)
 
+if test "$have_w32_system" = yes; then
+   NETLIBS="-lws2_32 $NETLIBS"
+fi
+
+
 # For src/libassuan-config.in
 LIBASSUAN_CONFIG_LIB="-lassuan"
 LIBASSUAN_CONFIG_CFLAGS=""
@@ -197,9 +216,6 @@ if test "$have_pth" = yes; then
 LIBASSUAN_CONFIG_THREAD_MODULES="pth"
 fi
 LIBASSUAN_CONFIG_EXTRA_LIBS=
-if test "$have_w32_system" = yes; then
-  LIBASSUAN_CONFIG_EXTRA_LIBS="$LIBASSUAN_CONFIG_EXTRA_LIBS -lws2_32"
-fi
 if test x"$NETLIBS" != x; then
   LIBASSUAN_CONFIG_EXTRA_LIBS="$LIBASSUAN_CONFIG_EXTRA_LIBS $NETLIBS"
 fi
diff --git a/src/Makefile.am b/src/Makefile.am
index 6749801..4f6aec3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,12 +102,12 @@ libassuan_la_LDFLAGS = $(libassuan_res_ldflag) $(no_undefined) \
 	@LIBASSUAN_LT_CURRENT@:@LIBASSUAN_LT_REVISION@:@LIBASSUAN_LT_AGE@
 libassuan_la_DEPENDENCIES = @LTLIBOBJS@ \
 	$(srcdir)/libassuan.vers $(libassuan_deps)
-libassuan_la_LIBADD = @LTLIBOBJS@ @GPG_ERROR_LIBS@
+libassuan_la_LIBADD = @LTLIBOBJS@ @NETLIBS@ @GPG_ERROR_LIBS@
 
 if HAVE_PTH
 libassuan_pth_la_SOURCES = $(common_sources) assuan-io-pth.c
 libassuan_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @GPG_ERROR_CFLAGS@ @PTH_CFLAGS@
 libassuan_pth_la_CFLAGS = $(AM_CFLAGS) @GPG_ERROR_CFLAGS@ $(PTH_CFLAGS)
-libassuan_pth_la_LIBADD = @LTLIBOBJS@ @GPG_ERROR_LIBS@ @PTH_LIBS@
+libassuan_pth_la_LIBADD = @LTLIBOBJS@ @NETLIBS@ @GPG_ERROR_LIBS@ @PTH_LIBS@
 endif
 
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index c87e946..485ce40 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -37,17 +37,6 @@
 #define DIRSEP_C '\\'
 #endif
 
-#ifdef HAVE_W32_SYSTEM
-/* Not needed anymore because the current mingw32 defines this in
-   sys/types.h */
-/* typedef int ssize_t; */
-
-/* Missing W32 functions */
-int putc_unlocked (int c, FILE *stream);
-void * memrchr (const void *block, int c, size_t size);
-char * stpcpy (char *dest, const char *src);
-#endif
-
 #define LINELENGTH ASSUAN_LINELENGTH
 
 
diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c
index 7b6322c..4dea21e 100644
--- a/src/assuan-pipe-connect.c
+++ b/src/assuan-pipe-connect.c
@@ -677,7 +677,7 @@ pipe_connect_w32 (assuan_context_t *ctx,
 
   /* Build the command line.  */
   if (build_w32_commandline (argv, &cmdline))
-    return _assuan_error (gpg_err_code from_syserror ());
+    return _assuan_error (gpg_err_code_from_syserror ());
 
   /* Create thew two pipes. */
   if (create_inheritable_pipe (rp, 0))
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index f88110d..67b07d1 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -191,7 +191,7 @@ assuan_init_socket_server_ext (assuan_context_t *r_ctx, assuan_fd_t fd,
 
   rc = _assuan_register_std_commands (ctx);
   if (rc)
-    xfree (ctx);
+    _assuan_free (ctx);
   else
     *r_ctx = ctx;
   return rc;
diff --git a/src/libassuan.def b/src/libassuan.def
index 839d95f..a7ca5ee 100644
--- a/src/libassuan.def
+++ b/src/libassuan.def
@@ -34,55 +34,54 @@ EXPORTS
     assuan_get_flag			@13  
     assuan_get_input_fd			@14  
     assuan_get_output_fd		@15  
-    assuan_get_peercred			@16  
-    assuan_get_pid			@17  
-    assuan_get_pointer			@18  
-    assuan_init_pipe_server		@19
-    assuan_init_socket_server		@21  
-    assuan_init_socket_server_ext	@22  
-    assuan_inquire			@23  
-    assuan_inquire_ext			@24  
-    assuan_pending_line			@25  
-    assuan_pipe_connect			@27  
-    assuan_pipe_connect_ext		@28  
-    assuan_process			@29  
-    assuan_process_done			@30  
-    assuan_process_next			@31  
-    assuan_read_line			@32  
-    assuan_receivefd			@33  
-    assuan_register_bye_notify		@34  
-    assuan_register_cancel_notify	@35  
-    assuan_register_command		@36  
-    assuan_register_input_notify	@37  
-    assuan_register_option_handler	@38  
-    assuan_register_output_notify	@39  
-    assuan_register_post_cmd_notify	@40  
-    assuan_register_reset_notify	@41  
-    assuan_send_data			@42  
-    assuan_sendfd			@43  
-    assuan_set_assuan_err_source	@44  
-    assuan_set_assuan_log_prefix	@45  
-    assuan_set_assuan_log_stream	@46  
-    assuan_set_error			@47  
-    assuan_set_flag			@48  
-    assuan_set_hello_line		@49  
-    assuan_set_io_hooks			@50  
-    assuan_set_io_monitor		@51  
-    assuan_set_log_stream		@52  
-    assuan_set_malloc_hooks		@53  
-    assuan_set_okay_line		@54  
-    assuan_set_pointer			@55  
-    assuan_sock_bind			@56  
-    assuan_sock_check_nonce		@57  
-    assuan_sock_close			@58  
-    assuan_sock_connect			@59  
-    assuan_sock_get_nonce		@60  
-    assuan_sock_new			@61  
-    assuan_socket_connect		@62  
-    assuan_socket_connect_ext		@63  
-    assuan_transact			@64  
-    assuan_write_line			@65  
-    assuan_write_status			@66  
+    assuan_get_pid			@16
+    assuan_get_pointer			@17
+    assuan_init_pipe_server		@18
+    assuan_init_socket_server		@19  
+    assuan_init_socket_server_ext	@20
+    assuan_inquire			@21
+    assuan_inquire_ext			@22
+    assuan_pending_line			@23
+    assuan_pipe_connect			@24
+    assuan_pipe_connect_ext		@25
+    assuan_process			@26
+    assuan_process_done			@27
+    assuan_process_next			@28
+    assuan_read_line			@29
+    assuan_receivefd			@30
+    assuan_register_bye_notify		@31
+    assuan_register_cancel_notify	@32
+    assuan_register_command		@33
+    assuan_register_input_notify	@34
+    assuan_register_option_handler	@35
+    assuan_register_output_notify	@36
+    assuan_register_post_cmd_notify	@37
+    assuan_register_reset_notify	@38
+    assuan_send_data			@39
+    assuan_sendfd			@40
+    assuan_set_assuan_err_source	@41
+    assuan_set_assuan_log_prefix	@42
+    assuan_set_assuan_log_stream	@43
+    assuan_set_error			@44
+    assuan_set_flag			@45
+    assuan_set_hello_line		@46
+    assuan_set_io_hooks			@47
+    assuan_set_io_monitor		@48
+    assuan_set_log_stream		@49
+    assuan_set_malloc_hooks		@50
+    assuan_set_okay_line		@51
+    assuan_set_pointer			@52
+    assuan_sock_bind			@53
+    assuan_sock_check_nonce		@54
+    assuan_sock_close			@55
+    assuan_sock_connect			@56
+    assuan_sock_get_nonce		@57
+    assuan_sock_new			@58
+    assuan_socket_connect		@59
+    assuan_socket_connect_ext		@60
+    assuan_transact			@61
+    assuan_write_line			@62
+    assuan_write_status			@63
 
 ; END
 
diff --git a/src/setenv.c b/src/setenv.c
index ff07d7b..debaa29 100644
--- a/src/setenv.c
+++ b/src/setenv.c
@@ -20,7 +20,10 @@
 # include <config.h>
 #endif
 
-#include "assuan-defs.h"
+#define setenv _assuan_setenv
+#define unsetenv _assuan_unsetenv
+#define clearenv _assuan_clearenv
+
 
 #define __builtin_expect(cond,val) (cond)
 
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index bfb652e..1793b00 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -1,4 +1,4 @@
-/* versioninfo.rc.in - for gpgme
+/* versioninfo.rc.in - for assuan
  *    Copyright (C) 2005 g10 Code GmbH
  * 
  * This file is free software; as a special exception the author gives
@@ -18,7 +18,7 @@
 
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @LIBGPGME_LT_CURRENT@,@LIBGPGME_LT_AGE@,@LIBGPGME_LT_REVISION@,@BUILD_REVISION@
+ FILEVERSION @BUILD_FILEVERSION@
  PRODUCTVERSION @BUILD_FILEVERSION@
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -36,14 +36,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License.\0"
             VALUE "CompanyName", "g10 Code GmbH\0"
-            VALUE "FileDescription", "GPGME - GnuPG Made Easy\0"
-            VALUE "FileVersion", "@LIBGPGME_LT_CURRENT@.@LIBGPGME_LT_AGE@.@LIBGPGME_LT_REVISION@.@BUILD_REVISION@\0"
-            VALUE "InternalName", "gpgme\0"
-            VALUE "LegalCopyright", "Copyright � 2005 g10 Code GmbH\0"
+            VALUE "FileDescription", "Assuan - GnuPG IPC\0"
+            VALUE "FileVersion", "@LIBASSUAN_LT_CURRENT@.@LIBASSUAN_LT_AGE@.@LIBASSUAN_LT_REVISION@.@BUILD_REVISION@\0"
+            VALUE "InternalName", "libassuan\0"
+            VALUE "LegalCopyright", "Copyright � 2003-2009 g10 Code GmbH\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "gpgme.dll\0"
+            VALUE "OriginalFilename", "libassuan.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "GPGME\0"
+            VALUE "ProductName", "Assuan\0"
             VALUE "ProductVersion", "@VERSION@\0"
             VALUE "SpecialBuild", "@BUILD_TIMESTAMP@\0"
         END