1 This patch fixes the lack of AC_LANG_PROGRAM in conditionals that contain
2 raw code, which generates errors from autoconf when re-run on the package.
3 We have upstream support ticket #12 to track the Solaris port, available
4 at: https://fedorahosted.org/mlocate/ticket/12
5 diff -rupN mlocate-0.25-clean/gnulib/m4/include_next.m4 mlocate-0.25/gnulib/m4/include_next.m4
6 --- mlocate-0.25-clean/gnulib/m4/include_next.m4 2010-03-26 19:38:17.000000000 +0000
7 +++ mlocate-0.25/gnulib/m4/include_next.m4 2013-02-18 19:01:29.072014923 +0000
10 save_CPPFLAGS="$CPPFLAGS"
11 CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2"
12 - AC_COMPILE_IFELSE([#include <conftest.h>],
13 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <conftest.h>])],
14 [gl_cv_have_include_next=yes],
15 [gl_cv_have_include_next=no])
16 CPPFLAGS="$save_CPPFLAGS"
17 diff -rupN mlocate-0.25-clean/gnulib/m4/wchar.m4 mlocate-0.25/gnulib/m4/wchar.m4
18 --- mlocate-0.25-clean/gnulib/m4/wchar.m4 2010-03-26 19:38:18.000000000 +0000
19 +++ mlocate-0.25/gnulib/m4/wchar.m4 2013-02-18 19:03:20.362999117 +0000
20 @@ -14,8 +14,8 @@ AC_DEFUN([gl_WCHAR_H],
21 AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
22 AC_CACHE_CHECK([whether <wchar.h> is standalone],
23 [gl_cv_header_wchar_h_standalone],
24 - [AC_COMPILE_IFELSE([[#include <wchar.h>
26 + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <wchar.h>
28 [gl_cv_header_wchar_h_standalone=yes],
29 [gl_cv_header_wchar_h_standalone=no])])
30 if test $gl_cv_header_wchar_h_standalone != yes; then