author | Edwin Beasant <Edwin.Beasant@oracle.com> |
Thu, 04 Apr 2013 20:41:44 +0100 | |
branch | s11-update |
changeset 2549 | 66da0486207a |
permissions | -rw-r--r-- |
2549
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
1 |
This patch fixes the lack of AC_LANG_PROGRAM in conditionals that contain |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
2 |
raw code, which generates errors from autoconf when re-run on the package. |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
3 |
We have upstream support ticket #12 to track the Solaris port, available |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
4 |
at: https://fedorahosted.org/mlocate/ticket/12 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
5 |
diff -rupN mlocate-0.25-clean/gnulib/m4/include_next.m4 mlocate-0.25/gnulib/m4/include_next.m4 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
6 |
--- mlocate-0.25-clean/gnulib/m4/include_next.m4 2010-03-26 19:38:17.000000000 +0000 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
7 |
+++ mlocate-0.25/gnulib/m4/include_next.m4 2013-02-18 19:01:29.072014923 +0000 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
8 |
@@ -30,7 +30,7 @@ EOF |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
9 |
EOF |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
10 |
save_CPPFLAGS="$CPPFLAGS" |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
11 |
CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2" |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
12 |
- AC_COMPILE_IFELSE([#include <conftest.h>], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
13 |
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <conftest.h>])], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
14 |
[gl_cv_have_include_next=yes], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
15 |
[gl_cv_have_include_next=no]) |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
16 |
CPPFLAGS="$save_CPPFLAGS" |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
17 |
diff -rupN mlocate-0.25-clean/gnulib/m4/wchar.m4 mlocate-0.25/gnulib/m4/wchar.m4 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
18 |
--- mlocate-0.25-clean/gnulib/m4/wchar.m4 2010-03-26 19:38:18.000000000 +0000 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
19 |
+++ mlocate-0.25/gnulib/m4/wchar.m4 2013-02-18 19:03:20.362999117 +0000 |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
20 |
@@ -14,8 +14,8 @@ AC_DEFUN([gl_WCHAR_H], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
21 |
AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
22 |
AC_CACHE_CHECK([whether <wchar.h> is standalone], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
23 |
[gl_cv_header_wchar_h_standalone], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
24 |
- [AC_COMPILE_IFELSE([[#include <wchar.h> |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
25 |
-wchar_t w;]], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
26 |
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <wchar.h> |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
27 |
+wchar_t w;])], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
28 |
[gl_cv_header_wchar_h_standalone=yes], |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
29 |
[gl_cv_header_wchar_h_standalone=no])]) |
66da0486207a
PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
30 |
if test $gl_cv_header_wchar_h_standalone != yes; then |