usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff
author Cyril Plisko <cyril.plisko@grigale.com>
Wed, 26 May 2010 22:56:24 -0700
changeset 15 24b3ef38fbcd
parent 9 502b128296a2
child 46 9c200dad5ecc
permissions -rw-r--r--
Import sfw build 141 Bugs Fixed ---------- 6927149 unpack-archive can not handle filenames with spaces 6934489 Update PostgreSQL 8.4 to 8.4.4 6934490 Update PostgreSQL 8.3 to 8.3.11 6934491 Update PostgreSQL 8.2 to 8.2.17 6947722 Upgrade CURL to 7.20.1 6951179 lcms update does not get along with ss12u1 6951444 Wireshark update to version 1.2.8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15
24b3ef38fbcd Import sfw build 141
Cyril Plisko <cyril.plisko@grigale.com>
parents: 9
diff changeset
     1
--- lib/Makefile.in	2010-03-31 23:56:24.000000000 -0700
24b3ef38fbcd Import sfw build 141
Cyril Plisko <cyril.plisko@grigale.com>
parents: 9
diff changeset
     2
+++ lib/Makefile.in	2010-04-23 11:04:44.426035257 -0700
24b3ef38fbcd Import sfw build 141
Cyril Plisko <cyril.plisko@grigale.com>
parents: 9
diff changeset
     3
@@ -341,7 +341,7 @@
9
502b128296a2 Import sfw build 135
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset
     4
 @USE_EMBEDDED_ARES_TRUE@           -I$(top_builddir)/ares         \
502b128296a2 Import sfw build 135
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset
     5
 @USE_EMBEDDED_ARES_TRUE@           -I$(top_srcdir)/ares
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
     6
 
9
502b128296a2 Import sfw build 135
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset
     7
-@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 6:0:2
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
     8
+@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 3:0:0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
     9
 
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    10
 #
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    11
 # Bumping of SONAME conditionally may seem like a weird thing to do, and yeah
15
24b3ef38fbcd Import sfw build 141
Cyril Plisko <cyril.plisko@grigale.com>
parents: 9
diff changeset
    12
@@ -352,7 +352,7 @@
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    13
 #
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    14
 # This conditional soname bump SHOULD be removed at next "proper" bump.
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    15
 #
9
502b128296a2 Import sfw build 135
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset
    16
-@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 7:0:2
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    17
+@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 3:0:0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    18
 
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    19
 # This flag accepts an argument of the form current[:revision[:age]]. So,
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset
    20
 # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to