Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

In autoconf v2.68, AC_LANG_PROGRAM must be quoted 

This change updates the AC_LANG_PROGRAM autoconf macro invocations to be
wrapped in quotes. As of autoconf version 2.68, the quotes are necessary
to prevent warnings from appearing. Specifically, the autoconf v2.68
Forward Porting Notes specifies:

    It is important to note that you need to ensure that the call to
    AC_LANG_SOURCE is quoted and not expanded, otherwise that will
    cause the warning to appear nonetheless.

Finally, because of the additional quoting we can drop the extra
quotas used by the ZFS_AC_CONFIG_USER_STACK_GUARD autoconf check.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #464
This commit is contained in:
Prakash Surya 2011-11-24 16:37:27 -08:00 committed by Brian Behlendorf
parent ada8ec1ec5
commit e89236fd28
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/always-no-unused-but-set-variable.m4
View File

@ -12,7 +12,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE], [
saved_flags="$CFLAGS" saved_flags="$CFLAGS"
CFLAGS="$CFLAGS -Wunused-but-set-variable" CFLAGS="$CFLAGS -Wunused-but-set-variable"
AC_RUN_IFELSE(AC_LANG_PROGRAM( [], []), AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])],
[ [
NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])

2
config/user-frame-larger-than.m4
View File

@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN], [
saved_flags="$CFLAGS" saved_flags="$CFLAGS"
CFLAGS="$CFLAGS -Wframe-larger-than=1024" CFLAGS="$CFLAGS -Wframe-larger-than=1024"
AC_RUN_IFELSE(AC_LANG_PROGRAM( [], []), AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])],
[ [
FRAME_LARGER_THAN=-Wframe-larger-than=1024 FRAME_LARGER_THAN=-Wframe-larger-than=1024
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])

4
config/user-libblkid.m4
View File

@ -39,7 +39,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
saved_LDFLAGS="$LDFLAGS" saved_LDFLAGS="$LDFLAGS"
LDFLAGS="-lblkid" LDFLAGS="-lblkid"
AC_RUN_IFELSE(AC_LANG_PROGRAM( AC_RUN_IFELSE([AC_LANG_PROGRAM(
[ [
#include <stdio.h> #include <stdio.h>
#include <blkid/blkid.h> #include <blkid/blkid.h>
@ -66,7 +66,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
free(value); free(value);
blkid_put_cache(cache); blkid_put_cache(cache);
]), ])],
[ [
rm -f $ZFS_DEV rm -f $ZFS_DEV
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])

6
config/user-nptl_guard_within_stack.m4
View File

@ -12,7 +12,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STACK_GUARD], [
saved_LDFLAGS="$LDFLAGS" saved_LDFLAGS="$LDFLAGS"
LDFLAGS="-lpthread" LDFLAGS="-lpthread"
AC_RUN_IFELSE(AC_LANG_PROGRAM( AC_RUN_IFELSE([AC_LANG_PROGRAM(
[ [
#include <pthread.h> #include <pthread.h>
#include <sys/resource.h> #include <sys/resource.h>
@ -25,7 +25,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STACK_GUARD], [
void * func(void *arg) void * func(void *arg)
{ {
char buf[[[BUFSIZE]]]; char buf[[BUFSIZE]];
} }
], ],
[ [
@ -41,7 +41,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STACK_GUARD], [
pthread_attr_setguardsize(&attr, PAGESIZE); pthread_attr_setguardsize(&attr, PAGESIZE);
pthread_create(&tid, &attr, func, NULL); pthread_create(&tid, &attr, func, NULL);
pthread_join(tid, NULL); pthread_join(tid, NULL);
]), ])],
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
], ],