author | Devjani Ray <devjani.ray@oracle.com> |
Fri, 20 May 2016 17:42:29 -0400 | |
branch | s11u3-sru |
changeset 6035 | c9748fcc32de |
parent 3830 | d9fd82448491 |
child 3995 | 7d35330d300c |
permissions | -rw-r--r-- |
3830
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# Use AC_W3M_SSL and AC_W3M_DIGEST_AUTH from acinclude.m4 instead of the |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# combined version in aclocal.m4, which gets overwritten when aclocal is run. |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
# |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
# Check for floor() instead of sqrt() to decide if we need libm |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
# |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
# use $(INSTALL) -d instead of @MKINSTALLDIR@ in po/Makefile... |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
# |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
# This patch needs to be evaluated to see if it needs to be passed upstream. |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
--- w3m-0.5.2.orig/configure.ac Thu May 31 07:17:05 2007 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+++ w3m-0.5.2/configure.ac Thu Dec 4 09:51:48 2014 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
@@ -88,10 +88,11 @@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
done |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
AC_W3M_IPv6 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
-AC_W3M_SSL_DIGEST_AUTH |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
+AC_W3M_SSL |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
+AC_W3M_DIGEST_AUTH |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
dnl Checks for libraries. |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
-AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)]) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+AC_CHECK_FUNC(floor,,[AC_CHECK_LIB(m, floor)]) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
if test x"$enable_mouse" = xyes; then |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
AC_SUBST(USE_W3M) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
--- w3m-0.5.2.orig/po/Makefile.in.in Tue May 29 22:15:13 2007 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+++ w3m-0.5.2/po/Makefile.in.in Thu Dec 4 09:57:40 2014 |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
@@ -27,8 +27,7 @@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
INSTALL = @INSTALL@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
INSTALL_DATA = @INSTALL_DATA@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
-MKINSTALLDIRS = @MKINSTALLDIRS@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
+mkinstalldirs = $(INSTALL) -d |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
GMSGFMT = @GMSGFMT@ |
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
MSGFMT = @MSGFMT@ |