1 # PERL and LUA setup for generating 64-bit binaries

     2 # The first three changes are Solaris-specific,

     3 # The last two changes are copied from Desktop consolidation,

     4 # not for upstream

     5 

     6 --- rrdtool-1.4.3/configure.ac     2014-02-03 15:33:25.524125781 +0530

     7 +++ rrdtool-1.4.3/configure.ac     2015-02-06 15:34:40.410120677 +0530

     8 @@ -544,8 +544,6 @@ PERL_VERSION

     9  CONFIGURE_PART(Prep for Building Language Bindings)

    10    

    11  dnl Check for Perl and friends

    12 -PATH=$PATH:/usr/perl5/bin

    13 -export PATH

    14  AC_PATH_PROG(PERL, perl, no)

    15  AC_PATH_PROG(POD2MAN, pod2man, no)

    16  AC_PATH_PROG(POD2HTML, pod2html, no)

    17 @@ -596,7 +594,7 @@ PERL_SETUP

    18  test "$langpref" = '$(DESTDIR)NONE' && langpref='$(DESTDIR)'$ac_default_prefix

    19  test "$langpref" = "NONE" && langpref=$ac_default_prefix

    20  

    21 -PERL_MAKE_OPTIONS="PREFIX=$langpref LIB=$langpref/lib/perl/$PERL_VERSION"

    22 +PERL_MAKE_OPTIONS="PREFIX=$langpref"

    23  

    24  dnl pass additional perl options when generating Makefile from Makefile.PL

    25  AC_ARG_ENABLE(perl-site-install,

    26 @@ -618,6 +616,22 @@ PERL_SETUP

    27     if test ! -z "$PERLLDFLAGS"; then

    28         PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LDFLAGS=$PERLLDFLAGS"

    29     fi

    30 +

    31 +   if test ! -z "$PERLLIB"; then

    32 +	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LIB=$PERLLIB"

    33 +   fi

    34 +

    35 +   if test ! -z "$PERLINSTALLMAN3DIR"; then

    36 +	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLMAN3DIR=$PERLINSTALLMAN3DIR"

    37 +   fi

    38 +

    39 +   if test ! -z "$PERLINSTALLSITEMAN3DIR"; then

    40 +	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLSITEMAN3DIR=$PERLINSTALLSITEMAN3DIR"

    41 +   fi

    42 +

    43 +   if test ! -z "$PERLINSTALLVENDORMAN3DIR"; then

    44 +	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLVENDORMAN3DIR=$PERLINSTALLVENDORMAN3DIR"

    45 +   fi

    46  fi

    47          

    48  AC_ARG_WITH(perl-options,

    49 @@ -725,8 +739,15 @@ LUA_EOF

    50        LIBS=

    51        lua_havelib=no

    52        LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51

    53 -      AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,

    54 -        [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,

    55 +         if test "$lua_vndot" = "52"; then

    56 +        CALL_FUNC=lua_callk

    57 +        REG_FUNC=luaL_setfuncs

    58 +      else

    59 +        CALL_FUNC=lua_call

    60 +        REG_FUNC=lua_register

    61 +      fi

    62 +      AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,

    63 +        [AC_SEARCH_LIBS($REG_FUNC, lua$lua_vdot lua$lua_vndot lua,

    64            [lua_havelib=LUA$lua_vndot],

    65            [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,

    66              [lua_havelib=$lua_vndot; $LUA -l compat-5.1 2>/dev/null;

    67 @@ -763,7 +784,12 @@ LUA_SETUP

    68            done

    69          fi

    70  

    71 -        LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"

    72 +	if test ! -z "$LUARRDLIBDIR"; then

    73 +         LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot/$LUARRDLIBDIR"

    74 +	else

    75 +	  LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"

    76 +	fi

    77 +

    78          # if lua 5.0 can't find compat-5.1, force installation of

    79          # compat-5.1.lua together with RRDtool.

    80          if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then