diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index 4e9d53d66..1349c1865 100644 --- a/configure.ac +++ b/configure.ac @@ -3,17 +3,17 @@ # 2008, 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. -# +# # GnuPG 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 3 of the License, or # (at your option) any later version. -# +# # GnuPG 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, see <http://www.gnu.org/licenses/>. # @@ -27,14 +27,15 @@ min_automake_version="1.9.3" # "svn up" and "autogen.sh --force" right before creating a distribution. m4_define([my_version], [1.4.12]) m4_define([my_issvn], [yes]) + m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \ | awk '/^\* / {printf "%s",$3}'])) -AC_INIT([gnupg], - [my_version[]m4_if(my_issvn,[yes], - [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])], - [[email protected]]) +m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes], + [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])]) + +AC_INIT([gnupg],[my_full_version],[http://bugs.gnupg.org]) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. @@ -210,7 +211,7 @@ if test x"$use_idea" = xyes ; then AC_MSG_CHECKING([for idea cipher module]) tmp="" - if test -f $srcdir/cipher/idea.c; then + if test -f $srcdir/cipher/idea.c; then IDEA_O=idea.o tmp=idea else @@ -468,7 +469,7 @@ is intended for making fat binary builds on OS X. */ # define GNUPG_TMP_SFX "_tmp" #else /*!def __VMS */ # define GNUPG_BAK_SFX "~" -# define GNUPG_TMP_SFX EXTSEP_S "tmp" +# define GNUPG_TMP_SFX EXTSEP_S "tmp" #endif /* def __VMS [else] */ @@ -486,7 +487,7 @@ is intended for making fat binary builds on OS X. */ # define GNUPG_LIBDIR "/SYS$MANAGER/gnupg_share" # define GNUPG_LIBEXECDIR "" # else -# define GNUPG_HOMEDIR "~/.gnupg" +# define GNUPG_HOMEDIR "~/.gnupg" # endif #endif @@ -634,7 +635,7 @@ 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 @@ -713,10 +714,10 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns # code to use the BIND 8 resolver API. AC_MSG_CHECKING([whether the resolver is usable]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h> + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> -#include <resolv.h>], +#include <resolv.h>]], [[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ); dn_skipname(0,0); dn_expand(0,0,0,0,0);]])],have_resolver=yes,have_resolver=no) AC_MSG_RESULT($have_resolver) @@ -725,11 +726,11 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns if test x"$have_resolver" != xyes ; then AC_MSG_CHECKING([whether I can make the resolver usable with BIND_8_COMPAT]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([#define BIND_8_COMPAT + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define BIND_8_COMPAT #include <sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> -#include <resolv.h>], +#include <resolv.h>]], [[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ); dn_skipname(0,0); dn_expand(0,0,0,0,0);]])],[have_resolver=yes ; need_compat=yes]) AC_MSG_RESULT($have_resolver) fi @@ -888,7 +889,7 @@ if test "$try_extensions" = yes || test x"$card_support" = xyes ; then AC_MSG_NOTICE([dlopen not found. Disabling extensions.]) try_extensions=no fi - + if test "$card_support" = yes ; then AC_MSG_WARN([dlopen not found. Disabling OpenPGP card support.]) card_support=no @@ -978,8 +979,8 @@ GNUPG_TIME_T_UNSIGNED # Ensure that we have UINT64_C before we bother to check for uint64_t AC_CHECK_HEADERS([inttypes.h]) AC_CACHE_CHECK([for UINT64_C], [gnupg_cv_uint64_c_works], - AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <inttypes.h>],[ -uint64_t foo=UINT64_C(42);]),gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no)) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <inttypes.h>]],[[ +uint64_t foo=UINT64_C(42);]])],gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no)) if test "$gnupg_cv_uint64_c_works" = "yes" ; then AC_CHECK_SIZEOF(uint64_t) @@ -1030,10 +1031,10 @@ AC_CHECK_FUNC(getopt,,AC_CHECK_LIB(iberty,getopt,AC_SUBST(GETOPT,"-liberty"))) # # check for gethrtime and run a testprogram to see whether -# it is broken. It has been reported that some Solaris and HP UX systems +# it is broken. It has been reported that some Solaris and HP UX systems # raise an SIGILL # -AC_CACHE_CHECK([for gethrtime], +AC_CACHE_CHECK([for gethrtime], [gnupg_cv_func_gethrtime], [AC_TRY_LINK([#include <sys/times.h>],[ hrtime_t tv; @@ -1045,13 +1046,13 @@ AC_CACHE_CHECK([for gethrtime], if test $gnupg_cv_func_gethrtime = yes; then AC_DEFINE([HAVE_GETHRTIME], 1, [Define if you have the `gethrtime(2)' function.]) - AC_CACHE_CHECK([whether gethrtime is broken], + AC_CACHE_CHECK([whether gethrtime is broken], [gnupg_cv_func_broken_gethrtime], [AC_TRY_RUN([ #include <sys/times.h> int main () { hrtime_t tv; - tv = gethrtime(); + tv = gethrtime(); } ], [gnupg_cv_func_broken_gethrtime=no], @@ -1063,7 +1064,7 @@ if test $gnupg_cv_func_gethrtime = yes; then [Define if `gethrtime(2)' does not work correctly i.e. issues a SIGILL.]) fi fi - + GNUPG_CHECK_MLOCK GNUPG_FUNC_MKDIR_TAKES_ONE_ARG @@ -1159,7 +1160,7 @@ if test "$use_static_rnd" = default; then ;; *) random_modules="rndlinux rndegd rndunix" - AC_DEFINE(USE_ALL_RANDOM_MODULES, 1, + AC_DEFINE(USE_ALL_RANDOM_MODULES, 1, [Allow to select random modules at runtime.]) ;; esac @@ -1180,23 +1181,23 @@ print_egd_warning=no for rndmod in $random_modules "" ; do case "$rndmod" in rndlinux) - AC_DEFINE(USE_RNDLINUX,1, + AC_DEFINE(USE_RNDLINUX,1, [Defined if the /dev/random based RNG should be used.]) use_rndlinux=yes ;; rndunix) - AC_DEFINE(USE_RNDUNIX,1, + AC_DEFINE(USE_RNDUNIX,1, [Defined if the default Unix RNG should be used.]) print_egd_warning=yes use_rndunix=yes ;; rndegd) - AC_DEFINE(USE_RNDEGD,1, + AC_DEFINE(USE_RNDEGD,1, [Defined if the EGD based RNG should be used.]) use_rndegd=yes ;; rndw32) - AC_DEFINE(USE_RNDW32,1, + AC_DEFINE(USE_RNDW32,1, [Defined if the Windows specific RNG should be used.]) use_rndw32=yes ;; @@ -1356,7 +1357,7 @@ GNUPG_CHECK_READLINE # Allow users to append something to the version string without # flagging it as development version. The user version parts is -# considered everything after a dash. +# considered everything after a dash. if test "$development_version" != yes; then changequote(,)dnl tmp_pat='[a-zA-Z]' @@ -1374,7 +1375,7 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) # add some extra libs here so that previous tests don't fail for -# mysterious reasons - the final link step should bail out. +# mysterious reasons - the final link step should bail out. case "${host}" in *-mingw32*) dnl NETLIBS="$NETLIBS -lwsock32" @@ -1413,7 +1414,7 @@ if test "$GCC" = yes; then _gcc_cflags_save=$CFLAGS CFLAGS="-Wno-pointer-sign" - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],_gcc_psign=yes,_gcc_psign=no) AC_MSG_RESULT($_gcc_psign) CFLAGS=$_gcc_cflags_save; @@ -1467,7 +1468,7 @@ AC_OUTPUT # Give some feedback echo -echo " Version info: $PACKAGE_STRING" +echo " Version info: $PACKAGE_STRING" echo " Configured for: $PRINTABLE_OS_NAME ($host)" if test -n "$show_extraasm"; then echo " Extra cpu specific functions:$show_extraasm" |