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/openscap/patches/configure.ac.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 01 Apr 2013 23:00:57 -0700
changeset 1243 cf247f5101ae
parent 848 0c3d865471c8
child 1369 20813e08fff3
permissions -rw-r--r--
Added tag s12-19 for changeset f52d88cf6f9e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
848
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
--- openscap-0.8.1/configure.ac.orig	2012-05-09 09:09:41.227540183 -0700
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
+++ openscap-0.8.1/configure.ac	2012-05-09 15:05:59.163156764 -0700
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
@@ -837,11 +837,11 @@
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 AC_PATH_PROG(PERL, perl)
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
 PERL_INCLUDES="`$PERL -e 'use Config; print $Config{archlib}'`/CORE"
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
-vendorlib="$(  $PERL -e 'use Config; print $Config{vendorlib}'  | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )"
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
-vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )"
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
+vendorlib="$(  $PERL -e 'use Config; print $Config{vendorlib}')"
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
+vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}')"
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
 AC_SUBST([PERL_INCLUDES], ["$PERL_INCLUDES"])
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
-AC_SUBST([perl_vendorlibdir], ['${prefix}'$vendorlib])
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
-AC_SUBST([perl_vendorarchdir], ['${prefix}'$vendorarch])
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
+AC_SUBST([perl_vendorlibdir], [$vendorlib])
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
+AC_SUBST([perl_vendorarchdir], [$vendorarch])
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
 AC_ARG_ENABLE([oval],
0c3d865471c8 PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
      [AC_HELP_STRING([--enable-oval], [include support for OVAL (default=yes)])],
upstream/oracle/userland-gate