author | naoki.tanaka@oracle.com <naoki.tanaka@oracle.com> |
Mon, 20 Jun 2016 11:20:50 -0700 | |
changeset 6257 | cdf29f584705 |
parent 6129 | d11d29f2920a |
child 7829 | 2de4f4ace09c |
permissions | -rw-r--r-- |
5897
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
2 |
Patch status: not Solaris-specific; suitable for upstream |
5897
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
3 |
|
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
4 |
Need to add architectures for Oracle build environments. |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
5 |
|
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
6 |
Need to disable rpath to avoid including 32-bit runpath in 64-bit binary. |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
7 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
8 |
Need to add AC_LANG_SOURCE to resolve autoreconf warnings. |
5897
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
9 |
|
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
10 |
Need to use an appropriate path for ldap.h. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
11 |
On S12, we build with OpenLDAP. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
12 |
On S11.3, the default is to build with OpenLDAP, but we can specifiy to build |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
13 |
with Mozilla LDAP instead by using --enable-openldap=no configure option. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
14 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
15 |
--- libpki-0.8.9/configure.in 2016-06-01 15:47:12.987843577 -0700 |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
16 |
+++ libpki-0.8.9/configure.in 2016-06-20 11:13:17.409345800 -0700 |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
17 |
@@ -36,11 +36,20 @@ |
5897
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
18 |
mybits="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
19 |
mybits_install="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
20 |
;; |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
21 |
+ *i86pc) |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
22 |
+ mybits="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
23 |
+ mybits_install="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
24 |
+ ;; |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
25 |
*sparc*) |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
26 |
mybits="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
27 |
mybits_install="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
28 |
is_sparc="yes" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
29 |
;; |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
30 |
+ *sun4v*) |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
31 |
+ mybits="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
32 |
+ mybits_install="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
33 |
+ is_sparc="yes" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
34 |
+ ;; |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
35 |
*aix*) |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
36 |
mybits="64" |
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
37 |
mybits_install="64" |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
38 |
@@ -203,11 +212,13 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
39 |
*sun*) myarch=solaris |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
40 |
shlext=so |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
41 |
rpath_opt="-R " |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
42 |
+ enable_rpath=no |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
43 |
;; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
44 |
*solaris*) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
45 |
myarch=solaris |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
46 |
shlext=so |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
47 |
rpath_opt="-R " |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
48 |
+ enable_rpath=no |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
49 |
;; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
50 |
*hpux*) myarch=hpux |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
51 |
shlext=so |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
52 |
@@ -545,6 +556,7 @@ |
5897
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
53 |
|
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
54 |
ldap_vendor= |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
55 |
ldap="yes" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
56 |
+openldap="yes" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
57 |
ldap_prefix="" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
58 |
ldap_path="" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
59 |
ldap_cflags="" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
60 |
@@ -562,6 +574,11 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
61 |
[enable ldap support ( default is yes)]), |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
62 |
ldap=$enableval, ldap=yes ) |
5897
495a9e2444e4
PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff
changeset
|
63 |
|
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
64 |
+AC_ARG_ENABLE(openldap, |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
65 |
+ AC_HELP_STRING( [--enable-openldap], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
66 |
+ [enable openldap support on Solaris 11.3 (default is yes)]), |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
67 |
+ openldap=$enableval, openldap=yes ) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
68 |
+ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
69 |
if [[ "x$enable_iphone" = "xyes" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
70 |
ldap="no" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
71 |
fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
72 |
@@ -780,12 +797,12 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
73 |
LDFLAGS="$mysql_ldflags $mysql_ldadd" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
74 |
ok=0 |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
75 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
76 |
- AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
77 |
+ AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
78 |
#include <mysql.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
79 |
int main(void) { |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
80 |
MYSQL *x; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
81 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
82 |
- }], [ ok=1 ], [ ok=0 ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
83 |
+ }])], [ ok=1 ], [ ok=0 ]) |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
84 |
|
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
85 |
CFLAGS="$OLD_CFLAGS" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
86 |
LDFLAGS="$OLD_LDFLAGS" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
87 |
@@ -884,12 +901,12 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
88 |
LDFLAGS="$pg_ldflags $pg_ldadd" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
89 |
ok=0 |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
90 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
91 |
- AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
92 |
+ AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
93 |
#include <libpq-fe.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
94 |
int main(void) { |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
95 |
PGconn *sql; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
96 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
97 |
- }], [ ok=1 ], [ ok=0 ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
98 |
+ }])], [ ok=1 ], [ ok=0 ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
99 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
100 |
CFLAGS="$OLD_CFLAGS" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
101 |
LDFLAGS="$OLD_LDFLAGS" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
102 |
--- libpki-0.8.9/acinclude.m4 2016-06-01 15:47:48.803434658 -0700 |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
103 |
+++ libpki-0.8.9/acinclude.m4 2016-06-16 13:16:34.558401470 -0700 |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
104 |
@@ -293,12 +293,12 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
105 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
106 |
dnl AC_MSG_RESULT([LD_LIBRARY_PATH=$library_path]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
107 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
108 |
-AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
109 |
+AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
110 |
#include <openssl/x509.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
111 |
int main(void) { |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
112 |
X509 *x = NULL; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
113 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
114 |
-}], [ ok=1 ], [ ok=0 ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
115 |
+}])], [ ok=1 ], [ ok=0 ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
116 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
117 |
CFLAGS=$old_cflags |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
118 |
LDFLAGS=$old_ldflags |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
119 |
@@ -337,12 +337,12 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
120 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
121 |
AC_MSG_CHECKING([checking for $1 support]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
122 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
123 |
-AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
124 |
+AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
125 |
#include <stdlib.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
126 |
int main(void) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
127 |
{ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
128 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
129 |
-}], [ _supported=yes ], [ _supported=no]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
130 |
+}])], [ _supported=yes ], [ _supported=no]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
131 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
132 |
if [[ $_supported = no ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
133 |
AC_MSG_RESULT([not supported]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
134 |
@@ -367,84 +367,62 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
135 |
AC_MSG_CHECKING([checking for ldap vendor]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
136 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
137 |
if ! [[ "$_prefix" = "" ]] ; then |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
138 |
- if $EGREP "Sun" "$_prefix/include/ldap.h" 2>&1 >/dev/null ; then |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
139 |
- AC_DEFINE(LDAP_VENDOR_SUN) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
140 |
- AC_MSG_RESULT([yes]) |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
141 |
- ldap_vendor="SUN" |
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
142 |
- else |
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
143 |
- if $EGREP "OpenLDAP" "$_prefix/include/ldap.h" 2>&1 >/dev/null ; then |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
144 |
- AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
145 |
- ldap_vendor="OPENLDAP" |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
146 |
- library_ldflags=[-L$_prefix/lib] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
147 |
- library_ldadd=[-lldap_r] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
148 |
+ dnl A directory path where ldap.h exists. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
149 |
+ dnl The deafult is $_prefix/include, but it can be different depending on |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
150 |
+ dnl operating systems and versions. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
151 |
+ ldap_include_dir=$_prefix/include |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
152 |
+ |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
153 |
+ if [[ "$myarch" = "solaris" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
154 |
+ if [[ "$DIST_VERSION" = "5.12" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
155 |
+ dnl On Solaris 12, we force to build with OpenLDAP. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
156 |
+ AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
157 |
+ AC_MSG_RESULT([yes]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
158 |
+ ldap_include_dir=$ldap_include_dir/openldap |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
159 |
+ ldap_vendor="OPENLDAP" |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
160 |
+ library_ldflags=[-L$_prefix/lib] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
161 |
+ library_ldadd=[-lldap_r] |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
162 |
+ else |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
163 |
+ dnl On Solaris 11.3, the default is to build with OpenLDAP, |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
164 |
+ dnl but when --enable-openldap=no configure option is specified, |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
165 |
+ dnl we build with Mozilla LDAP instead. |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
166 |
+ if [[ "x$openldap" = "xyes" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
167 |
+ AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
168 |
+ AC_MSG_RESULT([yes]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
169 |
+ ldap_include_dir=$ldap_include_dir/openldap |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
170 |
+ ldap_vendor="OPENLDAP" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
171 |
+ library_ldflags=[-L$_prefix/lib] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
172 |
+ library_ldadd=[-lldap_r] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
173 |
+ else |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
174 |
+ AC_DEFINE(LDAP_VENDOR_SUN) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
175 |
+ AC_MSG_RESULT([yes]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
176 |
+ ldap_vendor="SUN" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
177 |
+ ldap_lib=`ls "${_prefix}/lib/libldap.${shlext}" | head -n 1`; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
178 |
+ if [[ -z "$ldap_lib" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
179 |
+ AC_MSG_ERROR([*** LDAP: missing $_prefix/lib/libldap.$shlext!]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
180 |
+ fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
181 |
+ library_ldflags=[-L$_prefix/lib] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
182 |
+ library_ldadd=[-lldap] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
183 |
+ fi |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
184 |
+ fi |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
185 |
else |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
186 |
- AC_MSG_ERROR([*** LDAP::No supported vendors found in ($_prefix)***]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
187 |
- fi |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
188 |
- fi |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
189 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
190 |
- if [[ "$ldap_vendor" = "SUN" ]] ; then |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
191 |
- ldap_lib=`ls "${_prefix}/lib/libldap.${shlext}" | head -n 1`; |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
192 |
- if [[ -z "$ldap_lib" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
193 |
- AC_MSG_ERROR([*** LDAP: missing $_prefix/lib/libldap.$shlext!]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
194 |
+ if $EGREP "OpenLDAP" "$ldap_include_dir/ldap.h" 2>&1 >/dev/null ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
195 |
+ AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
196 |
+ AC_MSG_RESULT([yes]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
197 |
+ ldap_vendor="OPENLDAP" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
198 |
+ library_ldflags=[-L$_prefix/lib] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
199 |
+ library_ldadd=[-lldap_r] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
200 |
+ else |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
201 |
+ AC_MSG_ERROR([*** LDAP::No supported vendors found in ($ldap_include_dir)***]) |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
202 |
fi |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
203 |
- library_ldflags=[-L$_prefix/lib] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
204 |
- library_ldadd=[-lldap] |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
205 |
fi |
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
206 |
|
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
207 |
library_prefix=$_prefix; |
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
208 |
- library_cflags=[-I${_prefix}/include] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
209 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
210 |
-old_cflags=$CFLAGS |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
211 |
-old_ldflags=$LDFLAGS |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
212 |
-old_ldadd=$LDADD |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
213 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
214 |
-CFLAGS=$library_cflags |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
215 |
-LDFLAGS=$library_ldflags |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
216 |
-LDADD=$library_ldadd |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
217 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
218 |
-AC_MSG_RESULT([LDAP SEARCH: CFLAGS: $library_cflags]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
219 |
-AC_MSG_RESULT([LDAP SEARCH: LDFLAGS: $library_ldflags]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
220 |
-AC_MSG_RESULT([LDAP SEARCH: LDADD: $library_ldadd]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
221 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
222 |
-dnl AC_MSG_RESULT([LDAP VENDOR ===> searching for Sun]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
223 |
- AC_EGREP_CPP( [Sun], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
224 |
-[ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
225 |
-#include <ldap.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
226 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
227 |
-int main(void) { |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
228 |
- char *p = LDAP_VENDOR_NAME; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
229 |
- return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
230 |
-}], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
231 |
- [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
232 |
- AC_DEFINE(LDAP_VENDOR_SUN) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
233 |
- ldap_vendor="SUN" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
234 |
- ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
235 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
236 |
- if ! [[ "$ldap_vendor" = "SUN" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
237 |
- dnl AC_MSG_CHECKING([checking for OpenLDAP vendor ($_prefix) ]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
238 |
- AC_EGREP_CPP( [OpenLDAP], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
239 |
-[ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
240 |
-#include <ldap.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
241 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
242 |
-int main(void) { |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
243 |
- char *p = LDAP_VENDOR_NAME; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
244 |
- return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
245 |
-}], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
246 |
- [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
247 |
- AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
248 |
- dnl AC_MSG_CHECKING([checking for OpenLDAP vendor ($_prefix) ]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
249 |
- ldap_vendor="OPENLDAP" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
250 |
- ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
251 |
- fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
252 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
253 |
-LDFLAGS=$old_ldflags |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
254 |
-CFLAGS=$old_cflags |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
255 |
-LDADD=$old_ldadd |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
256 |
+ library_cflags=[-I$ldap_include_dir] |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
257 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
258 |
else |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
259 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
260 |
- AC_MSG_RESULT([LDAP VENDOR ($_prefix) ===> searching for Sun]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
261 |
- AC_EGREP_CPP( [Sun], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
262 |
+ AC_MSG_RESULT([LDAP VENDOR ===> searching for Sun]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
263 |
+ AC_EGREP_CPP( [Sun], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
264 |
[ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
265 |
#include <ldap.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
266 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
267 |
@@ -452,15 +430,15 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
268 |
char *p = LDAP_VENDOR_NAME; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
269 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
270 |
}], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
271 |
- [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
272 |
- AC_DEFINE(LDAP_VENDOR_SUN) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
273 |
- ldap_vendor="SUN" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
274 |
+ [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
275 |
+ AC_DEFINE(LDAP_VENDOR_SUN) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
276 |
+ ldap_vendor="SUN" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
277 |
library_ldadd="-lldap" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
278 |
- ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
279 |
+ ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
280 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
281 |
- if ! [[ "x$ldap_vendor" = "SUN" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
282 |
- AC_MSG_CHECKING([checking for OpenLDAP vendor ($_prefix) ]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
283 |
- AC_EGREP_CPP( [OpenLDAP], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
284 |
+ if ! [[ "x$ldap_vendor" = "SUN" ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
285 |
+ AC_MSG_CHECKING([checking for OpenLDAP vendor]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
286 |
+ AC_EGREP_CPP( [OpenLDAP], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
287 |
[ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
288 |
#include <ldap.h> |
6127
54565d218793
23492228 libpki doesn't build (work?) on s12-100
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
5897
diff
changeset
|
289 |
|
6257
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
290 |
@@ -468,16 +446,13 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
291 |
char *p = LDAP_VENDOR_NAME; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
292 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
293 |
}], |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
294 |
- [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
295 |
- AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
296 |
- ldap_vendor="OPENLDAP" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
297 |
+ [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
298 |
+ AC_DEFINE(LDAP_VENDOR_OPENLDAP) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
299 |
+ ldap_vendor="OPENLDAP" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
300 |
library_ldadd="-lldap_r" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
301 |
]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
302 |
- fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
303 |
+ fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
304 |
fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
305 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
306 |
- AC_MSG_RESULT([LDAP VENDOR: $ldap_vendor]); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
307 |
- |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
308 |
]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
309 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
310 |
AC_DEFUN(CHECK_EC, [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
311 |
@@ -548,7 +523,7 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
312 |
dnl fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
313 |
dnl ]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
314 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
315 |
-dnl AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
316 |
+dnl AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
317 |
dnl #include <openssl/ec.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
318 |
dnl #include <openssl/ecdsa.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
319 |
dnl #include <openssl/opensslconf.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
320 |
@@ -559,7 +534,7 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
321 |
dnl #endif |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
322 |
dnl EC_KEY *d = NULL; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
323 |
dnl return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
324 |
-dnl }], [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
325 |
+dnl }])], [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
326 |
dnl AC_DEFINE([ENABLE_ECDSA], 1, [ECC Support for OpenSSL]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
327 |
dnl activate_ecdsa=yes |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
328 |
dnl ], [activate_ecdsa=no]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
329 |
@@ -576,13 +551,13 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
330 |
dnl fi |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
331 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
332 |
AC_DEFUN(AC_OPENSSL_OCSP, |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
333 |
-[ AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
334 |
+[ AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
335 |
#include <openssl/ocsp.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
336 |
int main(void) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
337 |
{ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
338 |
OCSP_CERTID *cid = NULL; |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
339 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
340 |
-}], [ AC_DEFINE(HAVE_OCSP) ], [ocsp_error=1]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
341 |
+}])], [ AC_DEFINE(HAVE_OCSP) ], [ocsp_error=1]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
342 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
343 |
if [[ ocsp_error = 1 ]] ; then |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
344 |
AC_MSG_RESULT([checking for OpenSSL OCSP support ... no]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
345 |
@@ -611,19 +586,19 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
346 |
]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
347 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
348 |
AC_DEFUN(AC_GCC_CHECK_PRAGMA_IGNORED, |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
349 |
-[ AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
350 |
+[ AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
351 |
#include <stdio.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
352 |
#pragma GCC diagnostic ignored "-Wconversion" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
353 |
int main(void) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
354 |
{ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
355 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
356 |
} |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
357 |
-],[ AC_DEFINE(HAVE_GCC_PRAGMA_IGNORED, 1, [GCC pragma ignored]) ], []) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
358 |
+])],[ AC_DEFINE(HAVE_GCC_PRAGMA_IGNORED, 1, [GCC pragma ignored]) ], []) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
359 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
360 |
]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
361 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
362 |
AC_DEFUN(AC_GCC_CHECK_PRAGMA_POP, |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
363 |
-[ AC_RUN_IFELSE( [ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
364 |
+[ AC_RUN_IFELSE([AC_LANG_SOURCE([ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
365 |
#include <stdio.h> |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
366 |
#pragma GCC diagnostic ignored "-Wconversion" |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
367 |
int main(void) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
368 |
@@ -631,7 +606,7 @@ |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
369 |
return(0); |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
370 |
} |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
371 |
#pragma GCC diagnostic pop |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
372 |
-], [ AC_DEFINE(HAVE_GCC_PRAGMA_POP, 1, [GCC pragma pop]) ], []) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
373 |
+])], [ AC_DEFINE(HAVE_GCC_PRAGMA_POP, 1, [GCC pragma pop]) ], []) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
374 |
|
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
375 |
]) |
cdf29f584705
23528052 libpki's configure and Makefile need refactoring
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
6129
diff
changeset
|
376 |