diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2007-05-10 16:53:04 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2007-05-10 16:53:04 +0000 |
| commit | d46d2a24e997883d9e2623b4de36aa4a08ffc89c (patch) | |
| tree | 31f05936514cb4125c39fee731631e0571d7cdd6 | |
| parent | 6bd1a7bab32b6b077bee687161c43dc0fe82076f (diff) | |
[autoconf] GNU_SOURCE can be defined twice, through AC_FUNC_STRNLEN
2007-05-10 Paul Jakma <paul.jakma@sun.com>
* configure.ac: Use AC_GNU_SOURCE to define _GNU_SOURCE, rather
than having lib/zebra.h do it.
AC_FUNC_STRNLEN has side-effects with latest autoconf, use
AC_CHECK_FUNC on strnlen instead.
* lib/zebra.h: Don't try define _GNU_SOURCE, autoconf should do it.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure.ac | 14 | ||||
| -rw-r--r-- | lib/ChangeLog | 4 | ||||
| -rw-r--r-- | lib/zebra.h | 4 |
4 files changed, 17 insertions, 9 deletions
@@ -2,6 +2,10 @@ * configure.ac: Add back check for inet_aton, which got dropped somehow in previous jumbo patch. + Use AC_GNU_SOURCE to define _GNU_SOURCE, rather than having + lib/zebra.h do it. + AC_FUNC_STRNLEN has side-effects with latest autoconf, use + AC_CHECK_FUNC on strnlen instead. 2007-05-09 Paul Jakma <paul.jakma@sun.com> diff --git a/configure.ac b/configure.ac index f4966d80..fe127a47 100755 --- a/configure.ac +++ b/configure.ac @@ -163,10 +163,11 @@ AC_CACHE_CHECK([if ${MAKE-make} is GNU make], [quagga_cv_gnu_make], ] ) -dnl --------- -dnl AIX check -dnl --------- +dnl ----------------- +dnl System extensions +dnl ----------------- AC_AIX +AC_GNU_SOURCE dnl ------- dnl libtool @@ -640,7 +641,10 @@ AC_FUNC_REALLOC AC_FUNC_STAT AC_FUNC_SELECT_ARGTYPES AC_FUNC_STRFTIME -AC_FUNC_STRNLEN +dnl Avoid AC_FUNC_STRNLEN because it pulls in AC_SYSTEM_EXTENSIONS which +dnl can lead to strange side effects. So we just check for strnlen +dnl directly, see below. +dnlAC_FUNC_STRNLENdnl AC_FUNC_VPRINTF dnl ------------------------------- @@ -665,7 +669,7 @@ dnl --------------- dnl other functions dnl --------------- AC_CHECK_FUNCS([dup2 ftruncate getcwd gethostbyname getpagesize gettimeofday \ - inet_ntoa inet_aton \ + inet_ntoa inet_aton strnlen \ memchr memmove memset select socket \ strcasecmp strchr strcspn strdup strerror \ strncasecmp strndup strrchr strspn strstr \ diff --git a/lib/ChangeLog b/lib/ChangeLog index 5666cbad..4360c833 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2007-05-10 Paul Jakma <paul.jakma@sun.com> + + * zebra.h: Don't try define _GNU_SOURCE, autoconf should do it. + 2007-05-03 Paul Jakma <paul.jakma@sun.com> * memtypes.c: Add MTYPE_ATTR_EXTRA and MTYPE_BGP_ROUTE_EXTRA diff --git a/lib/zebra.h b/lib/zebra.h index 3c01aec3..2451dbed 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -25,10 +25,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef GNU_LINUX -#define _GNU_SOURCE -#endif /* GNU_LINUX */ - #ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ |