[svn] dirmngr - r267 - in trunk: . doc/examples src

[svn author wk]

Author: wk
Date: 2007-09-04 09:42:42 +0200 (Tue, 04 Sep 2007)
New Revision: 267

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/examples/Makefile.am
   trunk/src/ChangeLog
   trunk/src/Makefile.am
   trunk/src/get-path.c
Log:
Small build fixes by Moritz


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-23 09:56:16 UTC (rev 266)
+++ trunk/ChangeLog	2007-09-04 07:42:42 UTC (rev 267)
@@ -1,3 +1,7 @@
+2007-09-04  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Add test for locale.h.
+
 2007-08-23  Werner Koch  <wk at g10code.com>
 
 	* doc/Makefile.am (SUBDIRS): New.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-08-23 09:56:16 UTC (rev 266)
+++ trunk/configure.ac	2007-09-04 07:42:42 UTC (rev 267)
@@ -315,7 +315,7 @@
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([string.h])
+AC_CHECK_HEADERS([string.h locale.h])
 
 
 # Checks for typedefs, structures, and compiler characteristics.

Modified: trunk/doc/examples/Makefile.am
===================================================================
--- trunk/doc/examples/Makefile.am	2007-08-23 09:56:16 UTC (rev 266)
+++ trunk/doc/examples/Makefile.am	2007-09-04 07:42:42 UTC (rev 267)
@@ -1,19 +1,23 @@
 
-EXTRA_DIST = README dirmngr.conf bnetza-10r-ocsp.signer
+doc_exampledir = $(docdir)/examples
 
-EXTRA_DIST += trusted-certs/README \
+dist_doc_example_DATA = README dirmngr.conf bnetza-10r-ocsp.signer
+
+dist_doc_example_DATA += \
+              trusted-certs/README \
               trusted-certs/bnetza-10r-ca.crt
 
-EXTRA_DIST += extra-certs/bnetza-10r-ocsp-1.crt  \
-              extra-certs/bnetza-10r-ocsp-2.crt	 \
-              extra-certs/bnetza-10r-ocsp-3.crt	 \
-              extra-certs/bnetza-10r-ocsp-4.crt	 \
-              extra-certs/bnetza-10r-ocsp-5.crt	 \
-              extra-certs/bnetza-10r-ocsp-6.crt	 \
-              extra-certs/bnetza-10r-ocsp-7.crt	 \
-              extra-certs/bnetza-10r-ocsp-8.crt	 \
-              extra-certs/bnetza-10r-ocsp-9.crt	 \
-              extra-certs/bnetza-10r-ocsp-10.crt \
-              extra-certs/bnetza-10r-ocsp-11.crt \
-              extra-certs/bnetza-10r-ocsp-12.crt
+dist_doc_example_DATA += \
+	extra-certs/bnetza-10r-ocsp-1.crt \
+        extra-certs/bnetza-10r-ocsp-2.crt \
+        extra-certs/bnetza-10r-ocsp-3.crt \
+        extra-certs/bnetza-10r-ocsp-4.crt \
+        extra-certs/bnetza-10r-ocsp-5.crt \
+        extra-certs/bnetza-10r-ocsp-6.crt \
+        extra-certs/bnetza-10r-ocsp-7.crt \
+        extra-certs/bnetza-10r-ocsp-8.crt \
+        extra-certs/bnetza-10r-ocsp-9.crt \
+        extra-certs/bnetza-10r-ocsp-10.crt \
+        extra-certs/bnetza-10r-ocsp-11.crt \
+        extra-certs/bnetza-10r-ocsp-12.crt
 

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-08-23 09:56:16 UTC (rev 266)
+++ trunk/src/ChangeLog	2007-09-04 07:42:42 UTC (rev 267)
@@ -1,3 +1,10 @@
+2007-08-27  Moritz Schulte  <moritz at g10code.com>
+
+	* src/Makefile.am (AM_CPPFLAGS): Define DIRMNGR_SOCKETDIR based on
+	$(localstatedir).
+	* src/get-path.c (default_socket_name): Use DIRMNGR_SOCKETDIR
+	instead of hard-coded "/var/run/dirmngr".
+
 2007-08-16  Werner Koch  <wk at g10code.com>
 
 	* get-path.c (get_dirmngr_ldap_path): Make PATHNAME const.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-08-23 09:56:16 UTC (rev 266)
+++ trunk/src/Makefile.am	2007-09-04 07:42:42 UTC (rev 267)
@@ -33,6 +33,7 @@
 AM_CPPFLAGS += -DDIRMNGR_LIBEXECDIR="\"$(libexecdir)\""
 AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(localstatedir)/lib/@PACKAGE@\""
 AM_CPPFLAGS += -DDIRMNGR_CACHEDIR="\"$(localstatedir)/cache/@PACKAGE@\""
+AM_CPPFLAGS += -DDIRMNGR_SOCKETDIR="\"$(localstatedir)/run/@PACKAGE@\""
 
 AM_CFLAGS = -I$(top_srcdir)/jnlib $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) \
               $(KSBA_CFLAGS) $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)

Modified: trunk/src/get-path.c
===================================================================
--- trunk/src/get-path.c	2007-08-23 09:56:16 UTC (rev 266)
+++ trunk/src/get-path.c	2007-09-04 07:42:42 UTC (rev 267)
@@ -517,6 +517,6 @@
     }
   return name;
 #else /*!HAVE_W32_SYSTEM*/
-  return "/var/run/dirmngr/socket";
+  return DIRMNGR_SOCKETDIR "/socket";
 #endif /*!HAVE_W32_SYSTEM*/
 }