diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-11-25 10:20:49 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-11-25 10:20:49 +0000 |
| commit | 3011f319343421dccabbfc110c1d5d7c0b86251f (patch) | |
| tree | 039183108125bb1cee52c8e919e621eeab40dc88 /lgl | |
| parent | a5a69bb6160f21d9f91a9b328db1964a87f38e9b (diff) | |
| download | gnutls-3011f319343421dccabbfc110c1d5d7c0b86251f.tar.gz | |
Update.
Diffstat (limited to 'lgl')
| -rw-r--r-- | lgl/m4/alloca.m4 | 11 | ||||
| -rw-r--r-- | lgl/m4/gettext.m4 | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lgl/m4/alloca.m4 b/lgl/m4/alloca.m4 index 3e70d12a7c..eb62e0e7a5 100644 --- a/lgl/m4/alloca.m4 +++ b/lgl/m4/alloca.m4 @@ -1,4 +1,4 @@ -# alloca.m4 serial 6 +# alloca.m4 serial 7 dnl Copyright (C) 2002-2004, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,19 +17,22 @@ AC_DEFUN([gl_FUNC_ALLOCA], # Define an additional variable used in the Makefile substitution. if test $ac_cv_working_alloca_h = yes; then - AC_CACHE_VAL([gl_cv_rpl_alloca], [ + AC_CACHE_CHECK([for alloca as a compiler built-in], [gl_cv_rpl_alloca], [ AC_EGREP_CPP([Need own alloca], [ #if defined __GNUC__ || defined _AIX || defined _MSC_VER - Need own alloca + Need own alloca #endif ], [gl_cv_rpl_alloca=yes], [gl_cv_rpl_alloca=no]) ]) if test $gl_cv_rpl_alloca = yes; then + dnl OK, alloca can be implemented through a compiler built-in. AC_DEFINE([HAVE_ALLOCA], 1, - [Define to 1 if you have `alloca' after including <alloca.h>, + [Define to 1 if you have 'alloca' after including <alloca.h>, a header that may be supplied by this distribution.]) ALLOCA_H=alloca.h else + dnl alloca exists as a library function, i.e. it is slow and probably + dnl a memory leak. Don't define HAVE_ALLOCA in this case. ALLOCA_H= fi else diff --git a/lgl/m4/gettext.m4 b/lgl/m4/gettext.m4 index b5ce322fb1..91c345e992 100644 --- a/lgl/m4/gettext.m4 +++ b/lgl/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 58 (gettext-0.16) +# gettext.m4 serial 59 (gettext-0.16.1) dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -137,12 +137,14 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl to fall back to GNU NLS library. if test $gt_api_version -ge 3; then - gt_revision_test_code='[[ + gt_revision_test_code=' #ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif +changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]]' +changequote([,])dnl +' else gt_revision_test_code= fi |