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.174 by root, Tue May 4 21:45:42 2010 UTC vs.
Revision 1.175 by root, Wed May 5 09:05:03 2010 UTC

… …
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.1) 43AC_PATH_PROG(PERL, perl5.10.1)
44if test -z "$PERL"; then 44if test -z "$PERL"; then
45 AC_PATH_PROG(PERL, perl5.10.0) 45 AC_PATH_PROG(PERL, perl)
46 if test -z "$PERL"; then 46 if test -z "$PERL"; then
47 AC_PATH_PROG(PERL, perl)
48 if test -z "$PERL"; then
49 AC_MSG_ERROR([perl 5.10 or higher must be in your PATH, check the README]) 47 AC_MSG_ERROR([perl 5.10.1 or higher must be in your PATH, check the README])
50 fi
51 fi 48 fi
52fi 49fi
53 50
54for module_vers in \ 51for module_vers in \
55 "common::sense 3.2" \ 52 "common::sense 3.2" \
… …
126dnl else 123dnl else
127dnl AC_MSG_ERROR(no) 124dnl AC_MSG_ERROR(no)
128dnl fi 125dnl fi
129 126
130AC_MSG_CHECKING(for $PERL suitability) 127AC_MSG_CHECKING(for $PERL suitability)
131if $PERL -MExtUtils::Embed -e "use 5.10.0" >/dev/null 2>&1; then 128if $PERL -MExtUtils::Embed -e "use 5.10.1" >/dev/null 2>&1; then
132 save_CXXFLAGS="$CXXFLAGS" 129 save_CXXFLAGS="$CXXFLAGS"
133 save_LIBS="$LIBS" 130 save_LIBS="$LIBS"
134 xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 131 xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
135 xPERLFLAGS="$xPERLFLAGS `$PERL -MEV::MakeMaker -e 'print +{&EV::MakeMaker::ev_args}->{INC}'`" 132 xPERLFLAGS="$xPERLFLAGS `$PERL -MEV::MakeMaker -e 'print +{&EV::MakeMaker::ev_args}->{INC}'`"
136 xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`" 133 xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`"
… …
156 CPPFLAGS="$CPPFLAGS $PERLFLAGS" 153 CPPFLAGS="$CPPFLAGS $PERLFLAGS"
157 else 154 else
158 AC_MSG_ERROR([no, unable to link test program]) 155 AC_MSG_ERROR([no, unable to link test program])
159 fi 156 fi
160else 157else
161 AC_MSG_ERROR([no working perl found, or perl not version >= 5.10]) 158 AC_MSG_ERROR([no working perl found, or perl not version >= 5.10.1])
162fi 159fi
163AC_SUBST(PERLLIB) 160AC_SUBST(PERLLIB)
164AC_SUBST(PERLFLAGS) 161AC_SUBST(PERLFLAGS)
165AC_SUBST(PERLPRIVLIBEXP) 162AC_SUBST(PERLPRIVLIBEXP)
166AC_SUBST(PERL) 163AC_SUBST(PERL)

Diff Legend

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