diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-08 13:57:59 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-08 14:21:27 +0200 |
commit | ea5d1884419d58892540c0b77c8bc329c7cb0ca9 (patch) | |
tree | 045060edea80358bc9bba8508eb631bd20590fbe /gl/m4/stdarg.m4 | |
parent | 35239632fdba3ee96d9d98bbf38c2263d08626cb (diff) | |
download | gnutls-ea5d1884419d58892540c0b77c8bc329c7cb0ca9.tar.gz |
Use a single configure.ac. This speed ups compilation and
reduces duplication of code (multiple gl/ libraries etc.).
This saves about 2mb in distributed size (compressed).
Diffstat (limited to 'gl/m4/stdarg.m4')
-rw-r--r-- | gl/m4/stdarg.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gl/m4/stdarg.m4 b/gl/m4/stdarg.m4 index 8a62f2e844..5705de9eca 100644 --- a/gl/m4/stdarg.m4 +++ b/gl/m4/stdarg.m4 @@ -1,5 +1,5 @@ -# stdarg.m4 serial 4 -dnl Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc. +# stdarg.m4 serial 6 +dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,8 +9,8 @@ dnl Provide a working va_copy in combination with <stdarg.h>. AC_DEFUN([gl_STDARG_H], [ - STDARG_H=''; AC_SUBST([STDARG_H]) - NEXT_STDARG_H='<stdarg.h>'; AC_SUBST([NEXT_STDARG_H]) + STDARG_H='' + NEXT_STDARG_H='<stdarg.h>' AC_MSG_CHECKING([for va_copy]) AC_CACHE_VAL([gl_cv_func_va_copy], [ AC_COMPILE_IFELSE( @@ -41,7 +41,7 @@ void (*func) (va_list, va_list) = va_copy; if test $gl_aixcc = yes; then dnl Provide a substitute <stdarg.h> file. STDARG_H=stdarg.h - gl_CHECK_NEXT_HEADERS([stdarg.h]) + gl_NEXT_HEADERS([stdarg.h]) dnl Fallback for the case when <stdarg.h> contains only macro definitions. if test "$gl_cv_next_stdarg_h" = '""'; then gl_cv_next_stdarg_h='"///usr/include/stdarg.h"' @@ -72,4 +72,7 @@ error, bail out fi fi fi + AC_SUBST([STDARG_H]) + AM_CONDITIONAL([GL_GENERATE_STDARG_H], [test -n "$STDARG_H"]) + AC_SUBST([NEXT_STDARG_H]) ]) |