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/libxslt/patches/configure.in.patch
author John Beck <John.Beck@Oracle.COM>
Mon, 06 Oct 2014 11:36:29 -0700
branchs11-update
changeset 3369 d159dcb97df2
parent 148 33ca3897ae25
child 5150 8af18e2b90dd
permissions -rw-r--r--
19308541 update Python 2.7 line to version 2.7.8 (fix for RE audit)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
148
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     1
 
--- libxslt-1.1.26/configure.in.orig	Mon Mar 21 13:06:53 2011
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     2
 
+++ libxslt-1.1.26/configure.in	Mon Mar 21 13:08:28 2011
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -348,6 +348,10 @@
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     4
 
     else
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     5
 
         pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     6
 
     fi
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     7
 
+    if test "$PYTHON_VENDOR_PACKAGES" != ""
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     8
 
+    then
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
     9
 
+        PYTHON_SITE_PACKAGES=$PYTHON_VENDOR_PACKAGES
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    10
 
+    fi
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    11
 
 fi
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    12
 
 AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
33ca3897ae25 7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset 
    13
 
 if test "$PYTHON_INCLUDES" != ""
upstream/oracle/userland-gate