2003-06-06 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Use AM_PATH_GPG_ERROR.

gpgme/
2003-06-06  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (AM_CPPFLAGS): Add @GPG_ERROR_CFLAGS@.
	* gpgme-config.in (gpg_error_libs, gpg_error_cflags): New variables.
	Print them.

diff --git a/ChangeLog b/ChangeLog
index 58c69f7ca336db7b4ea9fcf62cb4d5c3e9adb04e..333da1761adc41ca5570f77c31d6b4bf82edbde4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-06  Marcus Brinkmann  <marcus@g10code.de>
 
+       * configure.ac: Use AM_PATH_GPG_ERROR.
+
        * configure.ac: Check for libgpg-error.  Define
        GPG_ERR_SOURCE_DEFAULT.
 

diff --git a/configure.ac b/configure.ac
index 51f02f054cbc392f9c0dfc3541a4a1f1d319955f..b10ae47ca9a03bc5b2250bf0277066849a52152e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@ fi
 #       However some code in assuan/ links against it.
 AC_REPLACE_FUNCS(fopencookie)
 
-AC_CHECK_LIB(gpg-error, strerror)
+AM_PATH_GPG_ERROR(0.1)
 AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
           [The default error source for GPGME.])
 dnl

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index da019673af28f03dd2f16fb7e00232994a236759..fbb8b569fdc70c901e7d1d6896e19726438b7b18 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,9 @@
 2003-06-06  Marcus Brinkmann  <marcus@g10code.de>
 
+       * Makefile.am (AM_CPPFLAGS): Add @GPG_ERROR_CFLAGS@.
+       * gpgme-config.in (gpg_error_libs, gpg_error_cflags): New variables.
+       Print them.
+
        * op-support.c (_gpgme_parse_inv_userid): Rename to
        _gpgme_parse_inv_recp and change to new datatype.
        * ops.h (_gpgme_parse_inv_key): Fix prototype.

diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index 9f61fc1b5e6e9af487b91db2363b3bf545aa3d39..d86229cc0938041e0a920450342fb2703dd7dbf3 100644 (file)
--- a/gpgme/Makefile.am
+++ b/gpgme/Makefile.am
@@ -38,9 +38,10 @@ libgpgme_la_LDFLAGS = $(libgpgme_version_script_cmd) -version-info \
       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 
 if BUILD_ASSUAN
-AM_CPPFLAGS = -I$(top_srcdir)/assuan
+assuan_cppflags = -I$(top_srcdir)/assuan
 assuan_libobjs = ../assuan/libassuan.la
 else
+assuan_cppflags =
 assuan_libobjs =
 endif
 
@@ -83,10 +84,10 @@ libgpgme_la_SOURCES =                                                       \
        ${gpgsm_components} sema.h io.h ${system_components}            \
        debug.c debug.h gpgme.c version.c error.c
 
+AM_CPPFLAGS = ${assuan_cppflags} @GPG_ERROR_CFLAGS@
 libgpgme_la_DEPENDENCIES = ${assuan_libobjs} @LTLIBOBJS@ \
        $(srcdir)/libgpgme.vers
-
-libgpgme_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@
+libgpgme_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@ @GPG_ERROR_LIBS@
 
 status-table.h : gpgme.h
        $(srcdir)/mkstatus < $(srcdir)/gpgme.h > status-table.h

diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in
index ffe3b593fbdede445754f73fa26c513db681e0d3..fb7a6d700f56185fc9099c19079ac1ae6362708d 100644 (file)
--- a/gpgme/gpgme-config.in
+++ b/gpgme/gpgme-config.in
@@ -22,6 +22,9 @@ echo_cflags=no
 echo_prefix=no
 echo_exec_prefix=no
 
+gpg_error_cflags=@GPG_ERROR_CFLAGS@
+gpg_error_libs=@GPG_ERROR_LIBS@
+
 
 usage()
 {
@@ -98,7 +101,7 @@ if test "$echo_cflags" = "yes"; then
        fi
       done
     fi
-    echo $includes $cflags
+    echo $gpg_error_cflags $includes $cflags
 fi
 
 if test "$echo_libs" = "yes"; then
@@ -110,6 +113,6 @@ if test "$echo_libs" = "yes"; then
        fi
       done
     fi
-    echo $libdirs $libs
+    echo $gpg_error_libs $libdirs $libs
 fi