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.16 by root, Thu Aug 31 06:23:17 2006 UTC vs.
Revision 1.20 by root, Thu Sep 7 20:23:01 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>
… …
223AC_SUBST(PERLLIB) 234AC_SUBST(PERLLIB)
224AC_SUBST(PERLFLAGS) 235AC_SUBST(PERLFLAGS)
225AC_SUBST(PERLPRIVLIBEXP) 236AC_SUBST(PERLPRIVLIBEXP)
226AC_SUBST(PERL) 237AC_SUBST(PERL)
227 238
228#############################################
229# Plugin configuration
230AC_CHECK_LIB(dl, dlopen,[ cf_have_libdl=yes ])
231AM_CONDITIONAL(HAVE_LIBDL,test "x$cf_have_libdl" = "xyes")
232
233if test "x$cf_have_libdl" = "xyes" ; then
234 ###############
235 # Python plugin
236dnl CF_CHECK_PYTHON(
237dnl [PLUGIN_PYTHON="cfpython.la"],
238dnl [AC_MSG_NOTICE([No Python found. Python plugin will not be built.])]
239dnl )
240 dnl *** Put other plugins configuration code here ***
241 :
242else
243 AC_MSG_NOTICE([No dl library found. Plugins will not be supported.])
244fi
245AM_CONDITIONAL(PYTHON_PLUGIN,test "x$PLUGIN_PYTHON" != "x")
246AC_SUBST(PLUGIN_PYTHON)
247
248AC_OUTPUT([Makefile 239AC_OUTPUT([Makefile
249 doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile 240 doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile
250 doc/spoiler/Makefile doc/spoiler-html/Makefile 241 doc/spoiler/Makefile doc/spoiler-html/Makefile doc/playbook/Makefile
251 doc/playbook/Makefile doc/playbook-html/Makefile 242 doc/playbook-html/Makefile doc/scripts/Makefile lib/Makefile
252 doc/scripts/Makefile
253 lib/Makefile random_maps/Makefile socket/Makefile server/Makefile src/Makefile 243 random_maps/Makefile socket/Makefile server/Makefile src/Makefile
254 include/Makefile utils/Makefile lib/checkarch.pl 244 include/Makefile utils/Makefile lib/checkarch.pl lib/collect.pl
255 lib/collect.pl utils/add_throw.perl utils/crossloop.tmpl utils/crossloop.pl.tmpl 245 utils/add_throw.perl utils/crossloop.tmpl utils/crossloop.pl.tmpl
256 utils/metaserver.pl utils/crossloop.web utils/scores.pl utils/player_dl.pl 246 utils/metaserver.pl utils/crossloop.web utils/scores.pl
257 common/Makefile plugins/Makefile plugins/cfpython/Makefile 247 utils/player_dl.pl common/Makefile
258 plugins/cfpython/include/Makefile
259 plugins/common/Makefile plugins/common/include/Makefile
260 devel/Makefile 248 devel/Makefile
261 ]) 249 ])

Diff Legend

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