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.14 by root, Mon Aug 28 16:52:50 2006 UTC vs.
Revision 1.18 by root, Mon Sep 4 11:07:58 2006 UTC

… …
11AC_PREFIX_DEFAULT(/usr/games/crossfire) 11AC_PREFIX_DEFAULT(/usr/games/crossfire)
12 12
13dnl we want a config.h file instead of -D options. 13dnl we want a config.h file instead of -D options.
14 14
15dnl Checks for programs. 15dnl Checks for programs.
16AC_LANG(C++)
16AC_PROG_CXX 17AC_PROG_CXX
17AC_LANG(C++)
18AC_PROG_LIBTOOL 18AC_PROG_LIBTOOL
19 19
20case "$target" in 20case "$target" in
21 alpha-dec-osf*) 21 alpha-dec-osf*)
22 # If we are not using gcc, we want the ansi version of cc. 22 # If we are not using gcc, we want the ansi version of cc.
… …
166 AC_MSG_RESULT(two arguments) 166 AC_MSG_RESULT(two arguments)
167else 167else
168 AC_MSG_RESULT(unknown) 168 AC_MSG_RESULT(unknown)
169fi 169fi
170 170
171AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
172
173AC_MSG_CHECKING(glib >= 2.10)
174if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then
175 CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`"
176 LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`"
177 AC_MSG_RESULT(ok)
178else
179 AC_MSG_ERROR(no)
180fi
181
171AC_SUBST(x_includes) 182AC_SUBST(x_includes)
172AC_SUBST(x_libraries) 183AC_SUBST(x_libraries)
173AC_SUBST(no_x) 184AC_SUBST(no_x)
174AM_CONDITIONAL(HAVE_X,test "x$no_x" = "x") 185AM_CONDITIONAL(HAVE_X,test "x$no_x" = "x")
175AC_SUBST(X11LIBS) 186AC_SUBST(X11LIBS)
… …
190AC_PATH_PROG(PERL, perl) 201AC_PATH_PROG(PERL, perl)
191 202
192AC_MSG_CHECKING(for $PERL suitability) 203AC_MSG_CHECKING(for $PERL suitability)
193if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 204if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
194 205
195 save_CFLAGS="$CFLAGS" 206 save_CXXFLAGS="$CXXFLAGS"
196 save_LIBS="$LIBS" 207 save_LIBS="$LIBS"
197 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`" 208 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
198 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 209 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
199 AC_TRY_LINK([ 210 AC_TRY_LINK([
200#include <EXTERN.h> 211#include <EXTERN.h>
… …
211 AC_MSG_RESULT(ok) 222 AC_MSG_RESULT(ok)
212 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) 223 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
213 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`" 224 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
214 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 225 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
215 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" 226 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
216 PERL_PLUGIN=yes 227 CPPFLAGS="$CPPFLAGS $PERLFLAGS"
217 else 228 else
218 AC_MSG_ERROR([no, unable to link]) 229 AC_MSG_ERROR([no, unable to link])
219 fi 230 fi
220else 231else
221 AC_MSG_ERROR([no working perl found, or perl not version >= 5.8]) 232 AC_MSG_ERROR([no working perl found, or perl not version >= 5.8])
222fi 233fi
223AC_SUBST(PERLLIB) 234AC_SUBST(PERLLIB)
224AC_SUBST(PERLFLAGS) 235AC_SUBST(PERLFLAGS)
225AC_SUBST(PERLPRIVLIBEXP) 236AC_SUBST(PERLPRIVLIBEXP)
226AC_SUBST(PERL) 237AC_SUBST(PERL)
227AM_CONDITIONAL(PERL_PLUGIN,test "x$PERL_PLUGIN" != "x")
228AC_SUBST(PERL_PLUGIN)
229 238
230############################################# 239#############################################
231# Plugin configuration 240# Plugin configuration
232AC_CHECK_LIB(dl, dlopen,[ cf_have_libdl=yes ]) 241AC_CHECK_LIB(dl, dlopen,[ cf_have_libdl=yes ])
233AM_CONDITIONAL(HAVE_LIBDL,test "x$cf_have_libdl" = "xyes") 242AM_CONDITIONAL(HAVE_LIBDL,test "x$cf_have_libdl" = "xyes")
… …
238dnl CF_CHECK_PYTHON( 247dnl CF_CHECK_PYTHON(
239dnl [PLUGIN_PYTHON="cfpython.la"], 248dnl [PLUGIN_PYTHON="cfpython.la"],
240dnl [AC_MSG_NOTICE([No Python found. Python plugin will not be built.])] 249dnl [AC_MSG_NOTICE([No Python found. Python plugin will not be built.])]
241dnl ) 250dnl )
242 dnl *** Put other plugins configuration code here *** 251 dnl *** Put other plugins configuration code here ***
252 :
243else 253else
244 AC_MSG_NOTICE([No dl library found. Plugins will not be supported.]) 254 AC_MSG_NOTICE([No dl library found. Plugins will not be supported.])
245fi 255fi
246AM_CONDITIONAL(PYTHON_PLUGIN,test "x$PLUGIN_PYTHON" != "x") 256AM_CONDITIONAL(PYTHON_PLUGIN,test "x$PLUGIN_PYTHON" != "x")
247AC_SUBST(PLUGIN_PYTHON) 257AC_SUBST(PLUGIN_PYTHON)
… …
249AC_OUTPUT([Makefile 259AC_OUTPUT([Makefile
250 doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile 260 doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile
251 doc/spoiler/Makefile doc/spoiler-html/Makefile 261 doc/spoiler/Makefile doc/spoiler-html/Makefile
252 doc/playbook/Makefile doc/playbook-html/Makefile 262 doc/playbook/Makefile doc/playbook-html/Makefile
253 doc/scripts/Makefile 263 doc/scripts/Makefile
254 lib/Makefile random_maps/Makefile socket/Makefile server/Makefile 264 lib/Makefile random_maps/Makefile socket/Makefile server/Makefile src/Makefile
255 include/Makefile utils/Makefile lib/checkarch.pl 265 include/Makefile utils/Makefile lib/checkarch.pl
256 lib/collect.pl utils/add_throw.perl utils/crossloop.tmpl utils/crossloop.pl.tmpl 266 lib/collect.pl utils/add_throw.perl utils/crossloop.tmpl utils/crossloop.pl.tmpl
257 utils/metaserver.pl utils/crossloop.web utils/scores.pl utils/player_dl.pl 267 utils/metaserver.pl utils/crossloop.web utils/scores.pl utils/player_dl.pl
258 common/Makefile plugins/Makefile plugins/cfpython/Makefile 268 common/Makefile plugins/Makefile plugins/cfpython/Makefile
259 plugins/cfpython/include/Makefile 269 plugins/cfpython/include/Makefile

Diff Legend

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