projects
/
gpgme.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2010-11-23 Marcus Brinkmann <mb@g10code.com>
[gpgme.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9b3b0d43b5a6e330b70918d0f7f8819ee54339da..9f36925af58b955eec1293f8d6dcff8d8a1f0989 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-58,6
+58,9
@@
LIBGPGME_LT_REVISION=0
GPGME_CONFIG_API_VERSION=1
##############################################
GPGME_CONFIG_API_VERSION=1
##############################################
+NEED_LIBASSUAN_API=2
+NEED_LIBASSUAN_VERSION=2.0.0
+
BUILD_REVISION=svn_revision
PACKAGE=$PACKAGE_NAME
BUILD_REVISION=svn_revision
PACKAGE=$PACKAGE_NAME
@@
-128,7
+131,12
@@
have_w32_system=no
build_w32_glib=no
build_w32_qt=no
case "${host}" in
build_w32_glib=no
build_w32_qt=no
case "${host}" in
- *-mingw32*)
+ *-mingw32ce*)
+ have_w32ce_system=yes
+ ;;
+esac
+case "${host}" in
+ *-mingw32ce*|*-mingw32*)
# special stuff for Windoze NT
have_dosish_system=yes
have_w32_system=yes
# special stuff for Windoze NT
have_dosish_system=yes
have_w32_system=yes
@@
-185,6
+193,10
@@
if test "$have_w32_system" = yes; then
AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
fi
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
fi
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
+if test "$have_w32ce_system" = yes; then
+ AC_DEFINE(HAVE_W32CE_SYSTEM,1, [Defined if we run on a W32 CE API based system])
+fi
+AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes)
AM_CONDITIONAL(BUILD_W32_QT, test "$build_w32_qt" = yes)
AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes)
AM_CONDITIONAL(BUILD_W32_QT, test "$build_w32_qt" = yes)
@@
-194,6
+206,7
@@
AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes")
# Checks for header files.
# Checks for header files.
+AC_CHECK_HEADERS([locale.h])
AC_CHECK_HEADERS(sys/select.h)
AC_CHECK_HEADERS([sys/uio.h])
AC_CHECK_HEADERS(sys/select.h)
AC_CHECK_HEADERS([sys/uio.h])
@@
-282,16
+295,21
@@
if test "$ac_cv_func_timegm" != yes; then
***])
fi
***])
fi
+AC_CHECK_FUNCS(setlocale)
+
# Checking for libgpg-error.
# Checking for libgpg-error.
-AM_PATH_GPG_ERROR(1.
4
,, AC_MSG_ERROR([libgpg-error was not found]))
+AM_PATH_GPG_ERROR(1.
8
,, AC_MSG_ERROR([libgpg-error was not found]))
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
[The default error source for GPGME.])
# And for libassuan.
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
[The default error source for GPGME.])
# And for libassuan.
-NEED_LIBASSUAN_VERSION=1.1.0
have_libassuan=no
have_libassuan=no
-AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_VERSION",
+AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_
API:$NEED_LIBASSUAN_
VERSION",
have_libassuan=yes, have_libassuan=no)
have_libassuan=yes, have_libassuan=no)
+if test "$have_libassuan" = "yes"; then
+ AC_DEFINE_UNQUOTED(GPGME_LIBASSUAN_VERSION, "$libassuan_version",
+ [version of the libassuan library])
+fi
AM_CONDITIONAL(HAVE_ASSUAN, test "$have_libassuan" = "yes")
if test "$have_libassuan" = "yes"; then
AC_DEFINE(ENABLE_ASSUAN,1,[Whether Assuan support is enabled])
AM_CONDITIONAL(HAVE_ASSUAN, test "$have_libassuan" = "yes")
if test "$have_libassuan" = "yes"; then
AC_DEFINE(ENABLE_ASSUAN,1,[Whether Assuan support is enabled])
@@
-541,15
+559,6
@@
AC_ARG_ENABLE(gpgsm-test,
run_gpgsm_test=$enableval)
AM_CONDITIONAL(RUN_GPGSM_TESTS, test "$run_gpgsm_test" = "yes")
run_gpgsm_test=$enableval)
AM_CONDITIONAL(RUN_GPGSM_TESTS, test "$run_gpgsm_test" = "yes")
-# Require libassuan if GPGSM is here.
-require_libassuan=no
-if test "$GPGSM" != "no"; then
- require_libassuan=yes
-fi
-if test "$G13" != "no"; then
- require_libassuan=yes
-fi
-
NO_OVERRIDE=no
AC_ARG_WITH(gpgconf,
NO_OVERRIDE=no
AC_ARG_WITH(gpgconf,
@@
-765,7
+774,7
@@
AC_CHECK_FUNCS(getgid getegid)
# Replacement functions.
AC_REPLACE_FUNCS(stpcpy)
# Check for unistd.h for setenv replacement function.
# Replacement functions.
AC_REPLACE_FUNCS(stpcpy)
# Check for unistd.h for setenv replacement function.
-AC_CHECK_HEADERS(
unistd.h
)
+AC_CHECK_HEADERS(
[unistd.h sys/time.h sys/types.h sys/stat.h]
)
AC_REPLACE_FUNCS(setenv)
# Assuan check for descriptor passing.
AC_REPLACE_FUNCS(setenv)
# Assuan check for descriptor passing.
@@
-789,6
+798,7
@@
AC_CHECK_MEMBER(struct cmsghdr.cmsg_len,
#include <unistd.h>
])
#include <unistd.h>
])
+use_descriptor_passing=no
AC_ARG_ENABLE(fd-passing,
AC_HELP_STRING([--enable-fd-passing], [use FD passing if supported]),
use_descriptor_passing=$enableval)
AC_ARG_ENABLE(fd-passing,
AC_HELP_STRING([--enable-fd-passing], [use FD passing if supported]),
use_descriptor_passing=$enableval)
@@
-848,6
+858,9
@@
AH_BOTTOM([
#else
# define GPGME_GCC_A_PURE
#endif
#else
# define GPGME_GCC_A_PURE
#endif
+
+/* Under WindowsCE we need gpg-error's strerror macro. */
+#define GPG_ERR_ENABLE_ERRNO_MACROS 1
])
])
@@
-879,14
+892,14
@@
AC_SUBST(emacs_local_vars_end, ['End:'])
# Last check.
die=no
# Last check.
die=no
-if test "$
requir
e_libassuan" = "no"; then
+if test "$
hav
e_libassuan" = "no"; then
die=yes
AC_MSG_NOTICE([[
***
*** You need libassuan to build this program with GPGSM support.
*** This library is for example available at
die=yes
AC_MSG_NOTICE([[
***
*** You need libassuan to build this program with GPGSM support.
*** This library is for example available at
-*** ftp://ftp.gnupg.org/
pub/gcrypt/alpha
/libassuan/
-*** (at least version $NEED_LIBASSUAN_VERSION is required).
+*** ftp://ftp.gnupg.org/
gcrypt
/libassuan/
+*** (at least version $NEED_LIBASSUAN_VERSION
(API $NEED_LIBASSUAN_API)
is required).
***]])
fi
***]])
fi
@@
-915,25
+928,25
@@
AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
AC_OUTPUT
echo "
AC_OUTPUT
echo "
- GPGME v${VERSION} has been configured as follows:
+
GPGME v${VERSION} has been configured as follows:
- GnuPG path: $GPG
+
GnuPG path: $GPG
GnuPG version: $GPG_VERSION, min. $NEED_GPG_VERSION
GnuPG version: $GPG_VERSION, min. $NEED_GPG_VERSION
- GpgSM path: $GPGSM
+
GpgSM path: $GPGSM
GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
- GpgConf path: $GPGCONF
+
GpgConf path: $GPGCONF
GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
- G13 path: $G13
+
G13 path: $G13
G13 version: $G13_VERSION, min. $NEED_G13_VERSION
G13 version: $G13_VERSION, min. $NEED_G13_VERSION
- Assuan version: $LIBASSUAN_VERSION
+ Assuan version: $
libassuan_version, min. $NEED_
LIBASSUAN_VERSION
- UI Server: $uiserver
+
UI Server: $uiserver
FD Passing: $use_descriptor_passing
FD Passing: $use_descriptor_passing
- GPGME Pthread: $have_pthread
- GPGME Pth: $have_pth
+
GPGME Pthread: $have_pthread
+
GPGME Pth: $have_pth
"
"