--- deliantra/server/configure.ac	2006/08/13 17:22:24	1.11
+++ deliantra/server/configure.ac	2006/08/13 17:47:24	1.12
@@ -13,8 +13,9 @@
 dnl we want a config.h file instead of -D options.
 
 dnl Checks for programs.
+AC_PROG_CXX
+AC_LANG(C++)
 AC_PROG_LIBTOOL
-AC_PROG_CC
 
 case "$target" in
   alpha-dec-osf*)
@@ -77,36 +78,7 @@
 AC_CHECK_LIB(socket, main)
 
 dnl Checks for libraries.
-dnl Start of X11 libraries
-AC_PATH_XTRA
-
-dnl Some of these checks are probably excessive.  Unfortunately, on
-dnl some systems, to link in Xaw, Xt you need SM, which needs ICE.
-dnl the order of the checks below is important
-OLD_LD_FLAGS="$LDFLAGS"
-LDFLAGS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
-
-AC_CHECK_LIB(X11, main, AC_DEFINE(HAVE_LIBX11,[],[Define if libX11 is available]) X11LIBS="$X11LIBS -lX11")
-
-AC_CHECK_LIB(ICE, main, AC_DEFINE(HAVE_LIBICE,[],[Define if libICE is available]) X11LIBS="$X11LIBS -lICE")
-
-AC_CHECK_LIB(SM, main, AC_DEFINE(HAVE_LIBSM,[],[Define if libSM is available]) X11LIBS="$X11LIBS -lSM", , $X11LIBS)
-
-AC_CHECK_LIB(Xext, main,  AC_DEFINE(HAVE_LIBXEXT,[],[Define if libEXT is available]) X11LIBS="$X11LIBS -lXext", , -lX11)
-
-AC_CHECK_LIB(Xt, main,  AC_DEFINE(HAVE_LIBXT,[],[Define if libXT is available]) X11LIBS="$X11LIBS -lXt", , $X11LIBS)
-
-AC_CHECK_LIB(Xmu, main,  AC_DEFINE(HAVE_LIBXMU,[],[Define if libXMU is available]) X11LIBS="$X11LIBS -lXmu", ,$X11LIBS)
-
-AC_CHECK_LIB(Xaw, main, AC_DEFINE(HAVE_LIBXAW,[],[Define if libXAW is available]) X11LIBS="-lXaw $X11LIBS", , $X11LIBS)
-
-LDFLAGS="$OLD_LD_FLAGS"
-X11LIBS="$X_LIBS $X11LIBS"
-
-AC_CHECK_LIB(Xpm, main,  AC_DEFINE(HAVE_LIBXPM,[],[Define if libXpm is available]) X11LIBS="$X11LIBS -lXpm", , $X11LIBS )
-
 AC_CHECK_LIB(m, main)
-
 AC_CHECK_LIB(png, main,  AC_DEFINE(HAVE_LIBPNG,[],[Define if libpng is available]) X11LIBS="$X11LIBS -lpng", , $X11LIBS )
 
 dnl png has a dependency in some cases on libz - if we have it, can't really
@@ -223,7 +195,7 @@
 
   save_CFLAGS="$CFLAGS"
   save_LIBS="$LIBS"
-  CFLAGS="$CFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
+  CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
   LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
   AC_TRY_LINK([
 #include <EXTERN.h>
@@ -233,7 +205,7 @@
 ],[
   PerlInterpreter *perl = perl_alloc ();
 ],[perl_link=yes],[perl_link=no])
-  CXXFLAGS="$save_CFLAGS"
+  CXXFLAGS="$save_CXXFLAGS"
   LIBS="$save_LIBS"
 
   if test x$perl_link = xyes; then