Skip to content

Commit

Permalink
In autoconf v2.68, AC_LANG_PROGRAM must be quoted
Browse files Browse the repository at this point in the history
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 <[email protected]>
Closes #464
  • Loading branch information
Prakash Surya authored and behlendorf committed Nov 28, 2011
1 parent ada8ec1 commit e89236f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/always-no-unused-but-set-variable.m4
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE], [
saved_flags="$CFLAGS"
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
AC_MSG_RESULT([yes])
Expand Down
2 changes: 1 addition & 1 deletion config/user-frame-larger-than.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN], [
saved_flags="$CFLAGS"
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
AC_MSG_RESULT([yes])
Expand Down
4 changes: 2 additions & 2 deletions config/user-libblkid.m4
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
saved_LDFLAGS="$LDFLAGS"
LDFLAGS="-lblkid"
AC_RUN_IFELSE(AC_LANG_PROGRAM(
AC_RUN_IFELSE([AC_LANG_PROGRAM(
[
#include <stdio.h>
#include <blkid/blkid.h>
Expand All @@ -66,7 +66,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
free(value);
blkid_put_cache(cache);
]),
])],
[
rm -f $ZFS_DEV
AC_MSG_RESULT([yes])
Expand Down
6 changes: 3 additions & 3 deletions config/user-nptl_guard_within_stack.m4
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STACK_GUARD], [
saved_LDFLAGS="$LDFLAGS"
LDFLAGS="-lpthread"
AC_RUN_IFELSE(AC_LANG_PROGRAM(
AC_RUN_IFELSE([AC_LANG_PROGRAM(
[
#include <pthread.h>
#include <sys/resource.h>
Expand All @@ -25,7 +25,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STACK_GUARD], [
void * func(void *arg)
{
char buf[[[BUFSIZE]]];
char buf[[BUFSIZE]];
}
],
[
Expand All @@ -41,7 +41,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STACK_GUARD], [
pthread_attr_setguardsize(&attr, PAGESIZE);
pthread_create(&tid, &attr, func, NULL);
pthread_join(tid, NULL);
]),
])],
[
AC_MSG_RESULT([no])
],
Expand Down

0 comments on commit e89236f

Please sign in to comment.