X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=configure.ac;h=ca88b84996b7a0f768fd2373575145825d4860e2;hb=86a439d1d15d42ed7a2e796902b91e8386f9e1d0;hp=6ac1a5ea43cb708b4a94e96cbdd16b163b528853;hpb=be3a828e7057e2ea01772b2a00d2ad3e5c46776c;p=gpgme.git diff --git a/configure.ac b/configure.ac index 6ac1a5e..ca88b84 100644 --- a/configure.ac +++ b/configure.ac @@ -1,27 +1,27 @@ # configure.ac for GPGME # Copyright (C) 2000 Werner Koch (dd9jn) # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -# 2009, 2010 g10 Code GmbH -# +# 2009, 2010, 2011 g10 Code GmbH +# # This file is part of GPGME. -# +# # GPGME is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as # published by the Free Software Foundation; either version 2.1 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 Lesser General # Public License for more details. -# +# # You should have received a copy of the GNU Lesser 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 - + # (Process this file with autoconf to produce a configure script.) AC_PREREQ(2.59) -min_automake_version="1.10" +min_automake_version="1.11" # Version number: Remember to change it immediately *after* a release. # Make sure to run "svn up" and "./autogen.sh --force" @@ -37,8 +37,11 @@ m4_define(my_issvn, [yes]) m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \ || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')])) -AC_INIT([gpgme], - [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])], +m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \ + | awk '/^\* / {printf "%s",$3}'])) +AC_INIT([gpgme], + [my_version[]m4_if(my_issvn,[yes], + [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])], [bug-gpgme@gnupg.org]) @@ -48,18 +51,22 @@ AC_INIT([gpgme], # (Interfaces added: AGE++) # (Interfaces removed/changed: AGE=0) # -LIBGPGME_LT_CURRENT=18 +LIBGPGME_LT_CURRENT=19 # Subtract 2 from this value if you want to make the LFS transition an # ABI break. [Note to self: Remove this comment with the next regular break.] -LIBGPGME_LT_AGE=7 +LIBGPGME_LT_AGE=8 LIBGPGME_LT_REVISION=0 # If the API is changed in an incompatible way: increment the next counter. GPGME_CONFIG_API_VERSION=1 ############################################## +NEED_LIBASSUAN_API=2 +NEED_LIBASSUAN_VERSION=2.0.2 + -BUILD_REVISION=svn_revision +m4_define([git_brevis],m4_esyscmd(printf "%u" 0x[]m4_substr(git_revision,0,4))) +BUILD_REVISION=m4_if(git_revision,[],[svn_revision],[git_brevis]) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -125,16 +132,19 @@ G13_DEFAULT=no component_system=None have_dosish_system=no have_w32_system=no +have_w64_system=no build_w32_glib=no build_w32_qt=no case "${host}" in + x86_64-*mingw32*) + have_w64_system=yes + ;; *-mingw32ce*) have_w32ce_system=yes ;; esac case "${host}" in *-mingw32ce*|*-mingw32*) - # special stuff for Windoze NT have_dosish_system=yes have_w32_system=yes GPG_DEFAULT='c:\\gnupg\\gpg.exe' @@ -180,20 +190,31 @@ esac if test "$have_dosish_system" = yes; then AC_DEFINE(HAVE_DOSISH_SYSTEM,1, - [Defined if we run on some of the PCDOS like systems + [Defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2) with special properties like no file modes]) fi AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes) if test "$have_w32_system" = yes; then - AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system]) + AC_DEFINE(HAVE_W32_SYSTEM,1, + [Defined if we run on any kind of W32 API based system]) + ACSUBST fi AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) + +if test "$have_w64_system" = yes; then + AC_DEFINE(HAVE_W64_SYSTEM,1, + [Defined if we run on a 64 bit W32 API based system]) +fi +AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_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]) + 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) @@ -226,6 +247,23 @@ case "$ac_cv_sys_file_offset_bits" in esac AC_SUBST(NEED__FILE_OFFSET_BITS) +# Figure out platform dependent typedefs for gpgme.h +if test "$have_w32_system" = yes; then + if test "$have_w64_system" = yes; then + INSERT__TYPEDEFS_FOR_GPGME_H="/* Typedefs for the 64 bit W32 API. */ +#include +typedef long off_t; +typedef __int64 ssize_t;" + else + INSERT__TYPEDEFS_FOR_GPGME_H="/* Typedefs for the 32 bit W32 API. */ +typedef long off_t; +typedef long ssize_t;" + fi +else + INSERT__TYPEDEFS_FOR_GPGME_H="#include " +fi +AC_SUBST(INSERT__TYPEDEFS_FOR_GPGME_H) +AM_SUBST_NOTMAKE(INSERT__TYPEDEFS_FOR_GPGME_H) # Checks for compiler features. if test "$GCC" = yes; then @@ -292,16 +330,21 @@ if test "$ac_cv_func_timegm" != yes; then ***]) fi +AC_CHECK_FUNCS(setlocale) + # Checking for libgpg-error. 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. -NEED_LIBASSUAN_VERSION=1.1.0 have_libassuan=no -AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_VERSION", +AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", 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]) @@ -551,15 +594,6 @@ AC_ARG_ENABLE(gpgsm-test, 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, @@ -775,7 +809,7 @@ AC_CHECK_FUNCS(getgid getegid) # 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. @@ -799,6 +833,7 @@ AC_CHECK_MEMBER(struct cmsghdr.cmsg_len, #include ]) +use_descriptor_passing=no AC_ARG_ENABLE(fd-passing, AC_HELP_STRING([--enable-fd-passing], [use FD passing if supported]), use_descriptor_passing=$enableval) @@ -826,12 +861,10 @@ fi AM_CONDITIONAL(HAVE_UISERVER, test "$uiserver" != "no") -AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+") - # Generate values for the DLL version info if test "$have_w32_system" = yes; then BUILD_TIMESTAMP=`date --iso-8601=minutes` - changequote(,)dnl + changequote(,)dnl BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` changequote([,])dnl BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}" @@ -853,20 +886,25 @@ AH_VERBATIM([SEPCONSTANTS], AH_BOTTOM([ /* Definition of GCC specific attributes. */ -#if __GNUC__ > 2 +#if __GNUC__ > 2 # define GPGME_GCC_A_PURE __attribute__ ((__pure__)) #else # define GPGME_GCC_A_PURE #endif + +/* Under WindowsCE we need gpg-error's strerror macro. */ +#define GPG_ERR_ENABLE_ERRNO_MACROS 1 ]) -# Substitution used for gpgme-config +# Substitution used for gpgme-config GPGME_CONFIG_LIBS="-lgpgme" GPGME_CONFIG_CFLAGS="" +GPGME_CONFIG_HOST="$host" AC_SUBST(GPGME_CONFIG_API_VERSION) AC_SUBST(GPGME_CONFIG_LIBS) AC_SUBST(GPGME_CONFIG_CFLAGS) +AC_SUBST(GPGME_CONFIG_HOST) # Frob'da Variables LTLIBOBJS=`echo "$LIB@&t@OBJS" | @@ -889,14 +927,14 @@ AC_SUBST(emacs_local_vars_end, ['End:']) # Last check. die=no -if test "$require_libassuan" = "no"; then +if test "$have_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 -*** 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 @@ -910,14 +948,14 @@ fi # -# Create config files +# Create config files AC_CONFIG_FILES(Makefile src/Makefile - tests/Makefile + tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile tests/opassuan/Makefile - doc/Makefile complus/Makefile + doc/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -925,25 +963,25 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) 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 - GpgSM path: $GPGSM + GpgSM path: $GPGSM GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION - GpgConf path: $GPGCONF + GpgConf path: $GPGCONF GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION - G13 path: $G13 + G13 path: $G13 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 - GPGME Pthread: $have_pthread - GPGME Pth: $have_pth + GPGME Pthread: $have_pthread + GPGME Pth: $have_pth "