author | Jacob Varughese <jacob.varughese@oracle.com> |
Mon, 29 Jul 2013 09:35:09 -0700 | |
branch | s11-update |
changeset 2705 | e39a44e3cb41 |
parent 848 | 0c3d865471c8 |
permissions | -rw-r--r-- |
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
1 |
This patch fixes the configure script to pick up the perl libraries correctly |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
2 |
for supporting perl bindings. |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
3 |
This patch has not been contributed upstream, but is planned to be done by |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
4 |
2013-Jul-12. |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
5 |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
6 |
--- openscap-0.9.7/configure.ac.~1~ 2013-04-26 04:47:24.501000000 -0700 |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
7 |
+++ openscap-0.9.7/configure.ac 2013-06-20 10:56:13.253028642 -0700 |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
8 |
@@ -1067,14 +1067,14 @@ |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
9 |
if test "x${perl_bind}" = xyes; then |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
10 |
AC_PATH_PROG(PERL, perl) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
11 |
PERL_INCLUDES="`$PERL -e 'use Config; print $Config{archlib}'`/CORE" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
12 |
- vendorlib="$( $PERL -e 'use Config; print $Config{vendorlib}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
13 |
- vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
14 |
+ vendorlib="$( $PERL -e 'use Config; print $Config{vendorlib}')" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
15 |
+ vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}')" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
16 |
AC_SUBST([PERL_INCLUDES], ["-I$PERL_INCLUDES"]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
17 |
- AC_SUBST([perl_vendorlibdir], ['${prefix}'$vendorlib]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
18 |
- AC_SUBST([perl_vendorarchdir], ['${prefix}'$vendorarch]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
19 |
+ AC_SUBST([perl_vendorlibdir], [$vendorlib]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
20 |
+ AC_SUBST([perl_vendorarchdir], [$vendorarch]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
21 |
save_CPPFLAGS="$CPPFLAGS" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
22 |
CPPFLAGS="$CPPFLAGS $PERL_INCLUDES" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
23 |
- AC_CHECK_HEADERS([EXTERN.h],[],[AC_MSG_ERROR(Perl development librarier are needed for perl bindings)],[-]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
24 |
+ AC_CHECK_HEADERS([EXTERN.h],[],[AC_MSG_ERROR(Perl development libraries are needed for perl bindings)],[-]) |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
25 |
CPPFLAGS="$save_CPPFLAGS" |
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
26 |
fi |
848
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |