| author | zihao.zhu@oracle.com <zihao.zhu@oracle.com> |
| Tue, 18 Oct 2016 14:50:09 -0700 | |
| changeset 7123 | b650e07ff9f6 |
| parent 6215 | 1f0767d254fe |
| permissions | -rw-r--r-- |
|
6215
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
Likely not appropriate for upstream in current form; needs further |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
investigation to see if there is a fix needed to libtool. |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
--- gtk+-3.16.3/configure.ac 2015-07-02 15:01:30.544630866 -0700 |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ gtk+-3.16.3/configure.ac 2015-07-02 15:18:42.000041546 -0700 |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -1681,6 +1681,11 @@ |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
if test "$have_libcanberra" = "no"; then |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
AC_MSG_ERROR([--enable-libcanberra specified, but not available]) |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
fi |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
+ |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
+ # Ensure gtk-3 and gdk-3 are omitted so that no attempt is made to link |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
+ # to any system-installed versions causing a multiple inclusion build |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
+ # failure. |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
+ LIBCANBERRA_LIBS=$(echo "$LIBCANBERRA_LIBS" | $SED -e 's/-lgtk-3//' -e 's/-lgdk-3//') |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
fi |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
fi |
|
1f0767d254fe
23245320 Move gtk+-3 to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |