GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2003-06-06 02:35:45 +00:00
parent a8fe22ca6b
commit 44b3538634
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2003-06-06 Marcus Brinkmann <marcus@g10code.de> 2003-06-06 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Use AM_PATH_GPG_ERROR.
* configure.ac: Check for libgpg-error. Define * configure.ac: Check for libgpg-error. Define
GPG_ERR_SOURCE_DEFAULT. GPG_ERR_SOURCE_DEFAULT.

2
configure.ac
View File

@ -168,7 +168,7 @@ fi
# However some code in assuan/ links against it. # However some code in assuan/ links against it.
AC_REPLACE_FUNCS(fopencookie) 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, AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
[The default error source for GPGME.]) [The default error source for GPGME.])
dnl dnl

4
gpgme/ChangeLog
View File

@ -1,5 +1,9 @@
2003-06-06 Marcus Brinkmann <marcus@g10code.de> 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 * op-support.c (_gpgme_parse_inv_userid): Rename to
_gpgme_parse_inv_recp and change to new datatype. _gpgme_parse_inv_recp and change to new datatype.
* ops.h (_gpgme_parse_inv_key): Fix prototype. * ops.h (_gpgme_parse_inv_key): Fix prototype.

7
gpgme/Makefile.am
View File

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

7
gpgme/gpgme-config.in
View File

@ -22,6 +22,9 @@ echo_cflags=no
echo_prefix=no echo_prefix=no
echo_exec_prefix=no echo_exec_prefix=no
gpg_error_cflags=@GPG_ERROR_CFLAGS@
gpg_error_libs=@GPG_ERROR_LIBS@
usage() usage()
{ {
@ -98,7 +101,7 @@ if test "$echo_cflags" = "yes"; then
fi fi
done done
fi fi
echo $includes $cflags echo $gpg_error_cflags $includes $cflags
fi fi
if test "$echo_libs" = "yes"; then if test "$echo_libs" = "yes"; then
@ -110,6 +113,6 @@ if test "$echo_libs" = "yes"; then
fi fi
done done
fi fi
echo $libdirs $libs echo $gpg_error_libs $libdirs $libs
fi fi