author | Yamei Feng <yamei.feng@oracle.com> |
Wed, 06 May 2015 15:27:49 -0700 | |
changeset 4250 | 80b910c051fc |
parent 3960 | 9e7316c31217 |
child 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 |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
2 |
# The first three changes are Solaris-specific, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
3 |
# The last two changes are copied from Desktop consolidation, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
4 |
# not for upstream |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
5 |
|
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
6 |
--- rrdtool-1.4.9/configure.ac Wed Apr 15 15:32:19 2015 |
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
7 |
+++ rrdtool-1.4.9/configure.ac Wed Apr 15 16:32:20 2015 |
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
8 |
@@ -555,8 +555,6 @@ PERL_VERSION |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
9 |
CONFIGURE_PART(Prep for Building Language Bindings) |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
10 |
|
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
11 |
dnl Check for Perl and friends |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
12 |
-PATH=$PATH:/usr/perl5/bin |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
13 |
-export PATH |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
14 |
AC_PATH_PROG(PERL, perl, no) |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
15 |
AC_PATH_PROG(POD2MAN, pod2man, no) |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
16 |
AC_PATH_PROG(POD2HTML, pod2html, no) |
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
17 |
@@ -607,7 +605,7 @@ PERL_SETUP |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
18 |
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
|
19 |
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
|
20 |
|
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
21 |
-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
|
22 |
+PERL_MAKE_OPTIONS="PREFIX=$langpref" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
23 |
|
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
24 |
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
|
25 |
AC_ARG_ENABLE(perl-site-install, |
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
26 |
@@ -629,6 +627,22 @@ PERL_SETUP |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
27 |
if test ! -z "$PERLLDFLAGS"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
28 |
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
|
29 |
fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
30 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
31 |
+ if test ! -z "$PERLLIB"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
32 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LIB=$PERLLIB" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
33 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
34 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
35 |
+ if test ! -z "$PERLINSTALLMAN3DIR"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
36 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLMAN3DIR=$PERLINSTALLMAN3DIR" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
37 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
38 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
39 |
+ if test ! -z "$PERLINSTALLSITEMAN3DIR"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
40 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLSITEMAN3DIR=$PERLINSTALLSITEMAN3DIR" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
41 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
42 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
43 |
+ if test ! -z "$PERLINSTALLVENDORMAN3DIR"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
44 |
+ PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLVENDORMAN3DIR=$PERLINSTALLVENDORMAN3DIR" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
45 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
46 |
fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
47 |
|
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
48 |
AC_ARG_WITH(perl-options, |
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
49 |
@@ -736,8 +750,15 @@ LUA_EOF |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
50 |
LIBS= |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
51 |
lua_havelib=no |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
52 |
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51 |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
53 |
- AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
54 |
- [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
55 |
+ if test "$lua_vndot" = "52"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
56 |
+ CALL_FUNC=lua_callk |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
57 |
+ REG_FUNC=luaL_setfuncs |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
58 |
+ else |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
59 |
+ CALL_FUNC=lua_call |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
60 |
+ REG_FUNC=lua_register |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
61 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
62 |
+ AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
63 |
+ [AC_SEARCH_LIBS($REG_FUNC, lua$lua_vdot lua$lua_vndot lua, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
64 |
[lua_havelib=LUA$lua_vndot], |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
65 |
[AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib, |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
66 |
[lua_havelib=$lua_vndot; $LUA -l compat-5.1 2>/dev/null; |
4250
80b910c051fc
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
Yamei Feng <yamei.feng@oracle.com>
parents:
3960
diff
changeset
|
67 |
@@ -774,7 +795,12 @@ LUA_SETUP |
3960
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
68 |
done |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
69 |
fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
70 |
|
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
71 |
- LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
72 |
+ if test ! -z "$LUARRDLIBDIR"; then |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
73 |
+ LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot/$LUARRDLIBDIR" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
74 |
+ else |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
75 |
+ LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot" |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
76 |
+ fi |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
77 |
+ |
9e7316c31217
20035678 Migrate rrdtool from Desktop consolidation to Userland
Yamei Feng <yamei.feng@oracle.com>
parents:
diff
changeset
|
78 |
# 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
|
79 |
# 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
|
80 |
if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then |