author | Danek Duvall <danek.duvall@oracle.com> |
Mon, 27 Feb 2017 16:13:00 -0800 | |
changeset 7831 | d0adeff33adb |
parent 6433 | f772255f6791 |
permissions | -rw-r--r-- |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
1 |
# PERL and LUA setup for generating 64-bit binaries |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
2 |
# Not for upstream, Solaris-specific |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
3 |
|
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
4 |
--- rrdtool-1.6.0/configure.ac 2016-05-19 16:38:31.633135607 -0700 |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
5 |
+++ rrdtool-1.6.0/configure.ac 2016-05-20 12:59:35.178966221 -0700 |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
6 |
@@ -614,8 +614,6 @@ |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
7 |
AM_CONDITIONAL(ENABLE_RPATH,[test "x$enable_rpath" = "xyes"]) |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
8 |
|
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
9 |
dnl Check for Perl and friends |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
10 |
-PATH=$PATH:/usr/perl5/bin |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
11 |
-export PATH |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
12 |
AC_PATH_PROG(PERL, perl, no) |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
13 |
AC_PATH_PROG(POD2MAN, pod2man, no) |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
14 |
AC_PATH_PROG(POD2HTML, pod2html, no) |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
15 |
@@ -666,7 +664,7 @@ |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
16 |
test "$langpref" = '$(DESTDIR)NONE' && langpref='$(DESTDIR)'$ac_default_prefix |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
17 |
test "$langpref" = "NONE" && langpref=$ac_default_prefix |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
18 |
|
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
19 |
-PERL_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/perl/$PERL_VERSION" |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
20 |
+PERL_MAKE_OPTIONS="PREFIX=$langpref" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
21 |
|
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
22 |
dnl pass additional perl options when generating Makefile from Makefile.PL |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
23 |
AC_ARG_ENABLE(perl-site-install, |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
24 |
@@ -688,6 +686,22 @@ |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
25 |
if test ! -z "$PERLLDFLAGS"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
26 |
PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LDFLAGS=$PERLLDFLAGS" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
27 |
fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
28 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
29 |
+ if test ! -z "$PERLLIB"; then |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
30 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LIB=$PERLLIB" |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
31 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
32 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
33 |
+ if test ! -z "$PERLINSTALLMAN3DIR"; then |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
34 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLMAN3DIR=$PERLINSTALLMAN3DIR" |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
35 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
36 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
37 |
+ if test ! -z "$PERLINSTALLSITEMAN3DIR"; then |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
38 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLSITEMAN3DIR=$PERLINSTALLSITEMAN3DIR" |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
39 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
40 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
41 |
+ if test ! -z "$PERLINSTALLVENDORMAN3DIR"; then |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
42 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLVENDORMAN3DIR=$PERLINSTALLVENDORMAN3DIR" |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
43 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
44 |
fi |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
45 |
|
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
46 |
AC_ARG_WITH(perl-options, |
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
47 |
@@ -833,7 +847,12 @@ |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
48 |
done |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
49 |
fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
50 |
|
6433
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
51 |
- LUA_RRD_LIBDIR="$libdir/lua/$lua_vdot" |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
52 |
+ if test ! -z "$LUARRDLIBDIR"; then |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
53 |
+ LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot/$LUARRDLIBDIR" |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
54 |
+ else |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
55 |
+ LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot" |
f772255f6791
23185092 Upgrade rrdtool to 1.6.0
Yamei Feng <yamei.feng@oracle.com>
parents:
4250
diff
changeset
|
56 |
+ fi |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
57 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
58 |
# if lua 5.0 can't find compat-5.1, force installation of |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
59 |
# compat-5.1.lua together with RRDtool. |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
60 |
if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then |