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/ghostscript/patches/09-ijs.automake.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 178 4340c0d63702
child 7819 b1bca76ec901
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
178
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     1
 
--- ghostscript-8.64/ijs/Makefile.am.orig	Tue Mar 29 04:38:15 2011
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     2
 
+++ ghostscript-8.64/ijs/Makefile.am	Tue Mar 29 04:38:26 2011
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     3
 
@@ -24,7 +24,7 @@
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     4
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     5
 
 ## Process this file with automake to produce Makefile.in.
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     6
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     7
 
-AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2 no-dependencies
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     8
 
+AUTOMAKE_OPTIONS = 1.10 foreign dist-bzip2 no-dependencies
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
     9
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    10
 
 @SET_MAKE@
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    11
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    12
 
--- ghostscript-8.64/ijs/autogen.sh.orig	Tue Mar 29 04:39:57 2011
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    13
 
+++ ghostscript-8.64/ijs/autogen.sh	Tue Mar 29 04:39:17 2011
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    14
 
@@ -33,7 +33,7 @@
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    15
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    16
 
 # do we need automake?
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    17
 
 (grep "^AM_INIT_AUTOMAKE" "$CONFIG_AC" >/dev/null) && {
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    18
 
-  AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP`
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    19
 
+  AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | nawk '{print $3}'`
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    20
 
   AM_NMAJOR=`echo $AM_NEEDED |cut -d. -f1`
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    21
 
   AM_NMINOR=`echo $AM_NEEDED |cut -d. -f2`
4340c0d63702 7019309 move ghostscript to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff changeset 
    22
 
   AM_NPATCHLEVEL=`echo $AM_NEEDED |cut -d. -f3`
upstream/oracle/userland-gate