| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Thu, 14 Jan 2016 10:01:14 -0800 | |
| changeset 5271 | 195e24ffa71a |
| parent 5055 | 9daf220c1a9a |
| child 5741 | b943514525d4 |
| permissions | -rw-r--r-- |
|
5055
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
Developed in-house at Oracle |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
sasl install destination for plugins needs to be configurable |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
Intended to go upstream |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
diff -rupN old/configure.in new/configure.in |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
--- old/configure.in 2015-01-16 16:06:51.953695234 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
+++ new/configure.in 2015-01-16 16:09:35.970052678 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
@@ -1019,6 +1019,12 @@ AC_ARG_WITH(configdir, [ --with-config |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir", [Runtime config file location]) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
AC_SUBST(configdir) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
+AC_ARG_WITH(sasldir, [ --with-sasldir=DIR set the directory where plugins |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
+ will be installed, possibly 32 vs 64 [[/usr/lib/sasl]] ], |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
+ sasldir=$withval, sasldir=/usr/lib/sasl) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
+AC_DEFINE_UNQUOTED(SASLDIR, "$sasldir", [Installtime plugin location]) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
+AC_SUBST(sasldir) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
+ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
dnl look for rc4 libraries. we accept the CMU one or one from openSSL |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
AC_ARG_WITH(rc4, [ --with-rc4 use internal rc4 routines [[yes]] ], |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
with_rc4=$withval, |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
diff -rupN old/Makefile.am new/Makefile.am |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
22 |
--- old/Makefile.am 2015-01-16 16:11:08.980698791 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
23 |
+++ new/Makefile.am 2015-01-16 16:16:28.670281716 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
24 |
@@ -83,14 +83,15 @@ dist-hook: |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
25 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
26 |
framedir = /Library/Frameworks/SASL2.framework |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
27 |
install-exec-local: $(INSTALLOSX) |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
28 |
- @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
29 |
+ @if test "$(plugindir)" != "$(sasldir)"; then \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
30 |
echo "********************************************************"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
31 |
echo "* WARNING:"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
32 |
- echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
33 |
+ echo "* Plugins are being installed into $(sasldir),"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
34 |
echo "* but the library will look for them in $(plugindir)."; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
35 |
- echo "* You need to make sure that the plugins will eventually"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
36 |
+ echo "* If this is not deliberate (for 32/64 bits), make " ; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
37 |
+ echo "* sure that the plugins will eventually"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
38 |
echo "* be in $(plugindir) -- the easiest way is to make a"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
39 |
- echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
40 |
+ echo "* symbolic link from $(plugindir) to $(sasldir),"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
41 |
echo "* but this may not be appropriate for your site, so this"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
42 |
echo "* installation procedure won't do it for you."; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
43 |
echo "*"; \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
44 |
diff -rupN old/plugins/Makefile.am new/plugins/Makefile.am |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
45 |
--- old/plugins/Makefile.am 2015-01-16 16:17:16.113465999 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
46 |
+++ new/plugins/Makefile.am 2015-01-16 16:18:02.347850991 -0800 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
47 |
@@ -63,7 +63,7 @@ plugindir = @plugindir@ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
48 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
49 |
common_sources = plugin_common.c plugin_common.h |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
50 |
|
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
51 |
-sasldir = $(prefix)/lib/sasl2 |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
52 |
+sasldir = @sasldir@ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
53 |
sasl_LTLIBRARIES = @SASL_MECHS@ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
54 |
EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ |
|
9daf220c1a9a
PSARC/2015/194 libsasl ON to Userland migration and update
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
55 |
libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ |