2002-04-05 Marcus Brinkmann <[email protected]>

	* acconfig.h: File removed.
	* configure.ac (NEED_GPG_VERSION): Add description.
	(NEED_GPGSM_VERSION): Likewise.
	(HAVE_DOSISH_SYSTEM): Likewise.
	(HAVE_DRIVE_LETTERS): Likewise.
	(GPG_PATH): Likewise.
	(GPGSM_PATH): Likewise.
	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Likewise.

5 files changed, 41 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index 951c258e..0d0cea05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-04-05  Marcus Brinkmann  <[email protected]>
+
+	* acconfig.h: File removed.
+	* configure.ac (NEED_GPG_VERSION): Add description.
+	(NEED_GPGSM_VERSION): Likewise.
+	(HAVE_DOSISH_SYSTEM): Likewise.
+	(HAVE_DRIVE_LETTERS): Likewise.
+	(GPG_PATH): Likewise.
+	(GPGSM_PATH): Likewise.
+	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Likewise.
+
 2002-04-01  Werner Koch  <[email protected]>
 
 	Released 0.3.5.
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 39d3844c..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* acconfig.h - used by autoheader to make config.h.in
- *	Copyright (C) 2000  Werner Koch (dd9jn)
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-#ifndef GPGME_CONFIG_H
-#define GPGME_CONFIG_H
-
-/* need this, because some autoconf tests rely on this (e.g. stpcpy)
- * and it should be used for new programs  */
-#define _GNU_SOURCE  1
-/* To allow the use of gpgme in multithreaded programs we have to use 
- * special features from the library.  
- * IMPORTANT: gpgme is not yet fully reentrant and you should use it
- * only from one thread. */
-#define _REENTRANT 1 
-
-@TOP@
-
-/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
- * with special properties like no file modes */
-#undef HAVE_DOSISH_SYSTEM
-/* defined if the filesystem uses driver letters */
-#undef HAVE_DRIVE_LETTERS
-/* Some systems have a mkdir that takes a single argument. */
-#undef MKDIR_TAKES_ONE_ARG
-
-/* Path to the GnuPG binary.  */
-#undef GPG_PATH
-/* Min. needed GnuPG version. */
-#undef NEED_GPG_VERSION
-
-/* Path to the GpgSM binary.  */
-#undef GPGSM_PATH
-/* Min. needed GpgSM version. */
-#undef NEED_GPGSM_VERSION
-
-/* Stuff needed by jnlib.  */
-#undef HAVE_BYTE_TYPEDEF
-#undef HAVE_USHORT_TYPEDEF
-#undef HAVE_ULONG_TYPEDEF
-#undef HAVE_U16_TYPEDEF
-#undef HAVE_U32_TYPEDEF
-
-
-
-@BOTTOM@
-
-/* not yet needed #include "gpgme-defs.h"*/
-
-#endif /*GPGME_CONFIG_H*/
diff --git a/acinclude.m4 b/acinclude.m4
index 01fe6ba5..7cbdb15b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,5 @@
 dnl Macros to configure gpgme
 
-
 dnl GNUPG_FIX_HDR_VERSION(FILE, NAME)
 dnl Make the version number in gcrypt/gcrypt.h the same as the one here.
 dnl (this is easier than to have a .in file just for one substitution)
@@ -27,8 +26,6 @@ AC_DEFUN(GNUPG_FIX_HDR_VERSION,
   ])
 
 
-
-
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl
@@ -42,16 +39,7 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF,
     ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
     AC_MSG_RESULT($gnupg_cv_typedef_$1)
     if test "$gnupg_cv_typedef_$1" = yes; then
-        AC_DEFINE($2)
+        AC_DEFINE($2, ,
+	 [Define to 1 if $1 is defined in the <sys/types.h> header file.])
     fi
   ])
-
-
-
-
-
-
-
-
-
-
diff --git a/configure.ac b/configure.ac
index 7a72b5f8..50711b86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,14 +44,32 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_MAINTAINER_MODE
 
+AH_VERBATIM([_GNU_SOURCE],
+[/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif])
+
+AH_VERBATIM([_REENTRANT],
+[/* To allow the use of GPGME in multithreaded programs we have to use
+  special features from the library.
+  IMPORTANT: gpgme is not yet fully reentrant and you should use it
+  only from one thread.  */
+#ifndef _REENTRANT
+# define _REENTRANT 1
+#endif])
+
+
 AC_PROG_CC
 
 
 AC_SUBST(LIBGPGME_LT_CURRENT)
 AC_SUBST(LIBGPGME_LT_AGE)
 AC_SUBST(LIBGPGME_LT_REVISION)
-AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION")
-AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION")
+AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION",
+				     [Min. needed GnuPG version.])
+AC_DEFINE_UNQUOTED(NEED_GPGSM_VERSION, "$NEED_GPGSM_VERSION",
+				       [Min. needed GPGSM version.])
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
@@ -70,8 +88,11 @@ case "${target}" in
         # special stuff for Windoze NT
         # OS/2 with the EMX environment
         # DOS with the DJGPP environment
-        AC_DEFINE(HAVE_DRIVE_LETTERS)
-        AC_DEFINE(HAVE_DOSISH_SYSTEM)
+        AC_DEFINE(HAVE_DRIVE_LETTERS, ,
+		  [Defined if we run on some of the PCDOS like systems (DOS,
+		   Windoze, OS/2) with special properties like no file modes.])
+        AC_DEFINE(HAVE_DOSISH_SYSTEM, ,
+		  [Defined if the filesystem uses driver letters.])
 	have_dosish_system=yes
         GPG_DEFAULT='c:\\gnupg\\gpg.exe'
         GPGSM_DEFAULT='c:\\gnupg\\gpgsm.exe'
@@ -162,7 +183,7 @@ if test "$GPG" = no; then
     fi
   fi
 else
-  AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG")
+  AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG", [Path to the GnuPG binary.])
   AC_SUBST(GPG)
 fi
 AM_CONDITIONAL(RUN_GPG_TESTS,
@@ -192,7 +213,7 @@ if test "$GPGSM" = no; then
     fi
   fi
 else
-  AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM")
+  AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM", [Path to the GPGSM binary.])
   AC_SUBST(GPGSM)
 fi
 AM_CONDITIONAL(RUN_GPGSM_TESTS,
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 468d09b3..49df9200 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -43,7 +43,7 @@ extern "C" {
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "0.3.5"
+#define GPGME_VERSION "0.3.6-cvs"
 
 
 /* The opaque data types used by GPGME.  */