ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/configure.ac
(Generate patch)

Comparing deliantra/server/configure.ac (file contents):
Revision 1.141 by root, Sun Aug 3 16:01:32 2008 UTC vs.
Revision 1.142 by root, Sat Aug 30 05:19:03 2008 UTC

… …
38AC_PATH_PROG(CONVERT, convert) 38AC_PATH_PROG(CONVERT, convert)
39if test -z "$CONVERT"; then 39if test -z "$CONVERT"; then
40 AC_MSG_ERROR([ImageMagick 'convert' must be in your PATH, check the README]) 40 AC_MSG_ERROR([ImageMagick 'convert' must be in your PATH, check the README])
41fi 41fi
42 42
43AC_PATH_PROG(PERL, perl5.10.0) 43AC_PATH_PROG(PERL, perl5.10.1)
44if test -z "$PERL"; then 44if test -z "$PERL"; then
45 AC_PATH_PROG(PERL, perl5.8.8) 45 AC_PATH_PROG(PERL, perl5.10.0)
46 if test -z "$PERL"; then 46 if test -z "$PERL"; then
47 AC_PATH_PROG(PERL, perl) 47 AC_PATH_PROG(PERL, perl)
48 if test -z "$PERL"; then 48 if test -z "$PERL"; then
49 AC_MSG_ERROR([perl 5.8 or higher must be in your PATH, check the README]) 49 AC_MSG_ERROR([perl 5.10 or higher must be in your PATH, check the README])
50 fi 50 fi
51 fi 51 fi
52fi 52fi
53 53
54for module_vers in \ 54for module_vers in \
… …
124dnl else 124dnl else
125dnl AC_MSG_ERROR(no) 125dnl AC_MSG_ERROR(no)
126dnl fi 126dnl fi
127 127
128AC_MSG_CHECKING(for $PERL suitability) 128AC_MSG_CHECKING(for $PERL suitability)
129if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then 129if $PERL -MExtUtils::Embed -e "use 5.10.0" >/dev/null 2>&1; then
130 save_CXXFLAGS="$CXXFLAGS" 130 save_CXXFLAGS="$CXXFLAGS"
131 save_LIBS="$LIBS" 131 save_LIBS="$LIBS"
132 xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 132 xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
133 xPERLFLAGS="$xPERLFLAGS `$PERL -MEV::MakeMaker -e 'print +{&EV::MakeMaker::ev_args}->{INC}'`" 133 xPERLFLAGS="$xPERLFLAGS `$PERL -MEV::MakeMaker -e 'print +{&EV::MakeMaker::ev_args}->{INC}'`"
134 xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`" 134 xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`"
… …
137 AC_TRY_LINK([ 137 AC_TRY_LINK([
138#include <EXTERN.h> 138#include <EXTERN.h>
139#include <perl.h> 139#include <perl.h>
140#include <XSUB.h> 140#include <XSUB.h>
141#include "EVAPI.h" 141#include "EVAPI.h"
142#include "CoroAPI.h"
142],[ 143],[
143 PerlInterpreter *perl = perl_alloc (); 144 PerlInterpreter *perl = perl_alloc ();
144],[perl_link=yes],[perl_link=no]) 145],[perl_link=yes],[perl_link=no])
145 CXXFLAGS="$save_CXXFLAGS" 146 CXXFLAGS="$save_CXXFLAGS"
146 LIBS="$save_LIBS" 147 LIBS="$save_LIBS"
147 148
148 if test x$perl_link = xyes; then 149 if test x$perl_link = xyes; then
149 AC_MSG_RESULT(ok) 150 AC_MSG_RESULT(ok)
150 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
151 PERLFLAGS="$xPERLFLAGS" 151 PERLFLAGS="$xPERLFLAGS"
152 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 152 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
153 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" 153 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
154 CPPFLAGS="$CPPFLAGS $PERLFLAGS" 154 CPPFLAGS="$CPPFLAGS $PERLFLAGS"
155 else 155 else
156 AC_MSG_ERROR([no, unable to link]) 156 AC_MSG_ERROR([no, unable to link test program])
157 fi 157 fi
158else 158else
159 AC_MSG_ERROR([no working perl found, or perl not version >= 5.8]) 159 AC_MSG_ERROR([no working perl found, or perl not version >= 5.10])
160fi 160fi
161AC_SUBST(PERLLIB) 161AC_SUBST(PERLLIB)
162AC_SUBST(PERLFLAGS) 162AC_SUBST(PERLFLAGS)
163AC_SUBST(PERLPRIVLIBEXP) 163AC_SUBST(PERLPRIVLIBEXP)
164AC_SUBST(PERL) 164AC_SUBST(PERL)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines