Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/mlocate/patches/ac_lang_quoted.patch
author Edwin Beasant <Edwin.Beasant@oracle.com>
Wed, 27 Mar 2013 18:02:48 +0000
changeset 1230 51caab77ce23
permissions -rw-r--r--
PSARC/2012/123 Replace slocate(1) with mlocate(1) 15803513 SUNBT7183731 mlocate should be added to the Userland consolidation
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1230
51caab77ce23 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
51caab77ce23 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.
51caab77ce23 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
51caab77ce23 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
51caab77ce23 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
51caab77ce23 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
51caab77ce23 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
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     8
 
@@ -30,7 +30,7 @@ EOF
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     9
 
 EOF
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    10
 
      save_CPPFLAGS="$CPPFLAGS"
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    11
 
      CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2"
51caab77ce23 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>],
51caab77ce23 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>])],
51caab77ce23 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],
51caab77ce23 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])
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    16
 
      CPPFLAGS="$save_CPPFLAGS"
51caab77ce23 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
51caab77ce23 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
51caab77ce23 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
51caab77ce23 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],
51caab77ce23 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])
51caab77ce23 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],
51caab77ce23 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],
51caab77ce23 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>
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    25
 
-wchar_t w;]],
51caab77ce23 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>
51caab77ce23 PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    27
 
+wchar_t w;])],
51caab77ce23 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],
51caab77ce23 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])])
51caab77ce23 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
upstream/oracle/userland-gate