diff --git a/aclocal/ax_thrift_internal.m4 b/aclocal/ax_thrift_internal.m4
index 8c0e3cb..097bcf5 100644
--- a/aclocal/ax_thrift_internal.m4
+++ b/aclocal/ax_thrift_internal.m4
@@ -18,7 +18,7 @@
 AC_DEFUN([AX_THRIFT_LIB],
          [
           AC_ARG_WITH($1,
-                      AC_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]),
+                      AS_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]),
                       [with_$1="$withval"],
                       [with_$1=$3]
                       )
diff --git a/configure.ac b/configure.ac
index ace48fc..eed4a84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,9 +311,9 @@
 if test "$with_perl" = "yes"; then
   AC_PATH_PROG([PERL], [perl])
   if test -n "$PERL" ; then
-    AC_PROG_PERL_MODULES([Bit::Vector], success="yes", success="no")
+    AX_PROG_PERL_MODULES([Bit::Vector],[success="yes"],[success="no"])
     have_perl_bit_vector="$success"
-    AC_PROG_PERL_MODULES([Class::Accessor], success="yes", success="no")
+    AX_PROG_PERL_MODULES([Class::Accessor],[success="yes"],[success="no"])
     have_perl_class_accessor="$success"
   fi
   if test -n "$PERL" -a "$have_perl_bit_vector" = "yes" ; then
@@ -589,13 +589,14 @@
   AM_CONDITIONAL(MINGW, true)
   ;;
 *)
-  AC_ISC_POSIX
+  AC_SEARCH_LIBS([strerror],[cposix])
   ;;
 esac
 
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE
+AC_C_RESTRICT
 
 AC_HEADER_STDBOOL
 AC_HEADER_STDC
diff --git a/contrib/fb303/aclocal/ax_thrift_internal.m4 b/contrib/fb303/aclocal/ax_thrift_internal.m4
index 8c0e3cb..097bcf5 100644
--- a/contrib/fb303/aclocal/ax_thrift_internal.m4
+++ b/contrib/fb303/aclocal/ax_thrift_internal.m4
@@ -18,7 +18,7 @@
 AC_DEFUN([AX_THRIFT_LIB],
          [
           AC_ARG_WITH($1,
-                      AC_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]),
+                      AS_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]),
                       [with_$1="$withval"],
                       [with_$1=$3]
                       )