matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

[autoconf] GNU_SOURCE can be defined twice, through AC_FUNC_STRNLEN

Browse source 
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.
This commit is contained in:
Paul Jakma 2007-05-10 16:53:04 +00:00
parent 6bd1a7bab3
commit d46d2a24e9
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -2,6 +2,10 @@
* configure.ac: Add back check for inet_aton, which got dropped * configure.ac: Add back check for inet_aton, which got dropped
somehow in previous jumbo patch. 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> 2007-05-09 Paul Jakma <paul.jakma@sun.com>

14
configure.ac
View file

@ -163,10 +163,11 @@ AC_CACHE_CHECK([if ${MAKE-make} is GNU make], [quagga_cv_gnu_make],
] ]
) )
dnl --------- dnl -----------------
dnl AIX check dnl System extensions
dnl --------- dnl -----------------
AC_AIX AC_AIX
AC_GNU_SOURCE
dnl ------- dnl -------
dnl libtool dnl libtool
@ -640,7 +641,10 @@ AC_FUNC_REALLOC
AC_FUNC_STAT AC_FUNC_STAT
AC_FUNC_SELECT_ARGTYPES AC_FUNC_SELECT_ARGTYPES
AC_FUNC_STRFTIME 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 AC_FUNC_VPRINTF
dnl ------------------------------- dnl -------------------------------
@ -665,7 +669,7 @@ dnl ---------------
dnl other functions dnl other functions
dnl --------------- dnl ---------------
AC_CHECK_FUNCS([dup2 ftruncate getcwd gethostbyname getpagesize gettimeofday \ AC_CHECK_FUNCS([dup2 ftruncate getcwd gethostbyname getpagesize gettimeofday \
inet_ntoa inet_aton \ inet_ntoa inet_aton strnlen \
memchr memmove memset select socket \ memchr memmove memset select socket \
strcasecmp strchr strcspn strdup strerror \ strcasecmp strchr strcspn strdup strerror \
strncasecmp strndup strrchr strspn strstr \ strncasecmp strndup strrchr strspn strstr \

4
lib/ChangeLog
View file

@ -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> 2007-05-03 Paul Jakma <paul.jakma@sun.com>
* memtypes.c: Add MTYPE_ATTR_EXTRA and MTYPE_BGP_ROUTE_EXTRA * memtypes.c: Add MTYPE_ATTR_EXTRA and MTYPE_BGP_ROUTE_EXTRA

4
lib/zebra.h
View file

@ -25,10 +25,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "config.h" #include "config.h"
#endif /* HAVE_CONFIG_H */ #endif /* HAVE_CONFIG_H */
#ifdef GNU_LINUX
#define _GNU_SOURCE
#endif /* GNU_LINUX */
#ifdef SUNOS_5 #ifdef SUNOS_5
#define _XPG4_2 #define _XPG4_2
#define __EXTENSIONS__ #define __EXTENSIONS__