diff --git a/mk/linux/configure.ac b/mk/linux/configure.ac index 3bc522819..a9581675b 100644 --- a/mk/linux/configure.ac +++ b/mk/linux/configure.ac @@ -4,183 +4,13 @@ #---------------------------------------------------------------------------- AC_PREREQ([2.54]) -AC_INIT([megaglest], [3.3.7.2], [matze@braunis.de]) -AC_CONFIG_SRCDIR([mk/jam/build.jam]) +AC_INIT([megaglest], [3.4.0], [matze@braunis.de]) +#AC_CONFIG_SRCDIR([mk/jam/build.jam]) +AC_CONFIG_SRCDIR([mk]) AC_CONFIG_AUX_DIR([mk/autoconf]) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET -#---------------------------------------------------------------------------- -# Configuration header -#---------------------------------------------------------------------------- -AC_C_BIGENDIAN() -# stupid autoconf is adding default -g -O2 flags when we don't want this :-/ -test ".$CXXFLAGS" = "." && CXXFLAGS=" " - -# here we define required defines for streflop -AC_DEFINE([USE_STREFLOP], [], [Define if streflop should be used]) -AC_DEFINE([STREFLOP_SSE], [], [Define type of streflop to use]) -#AC_DEFINE([STREFLOP_X87], [], [Define type of streflop to use]) -#AC_DEFINE([STREFLOP_SOFT], [], [Define type of streflop to use]) -AC_DEFINE([LIBM_COMPILING_FLT32], [], [Define which libm compile type should be used]) -# end - -#---------------------------------------------------------------------------- -# Check for build variant (debug, profile, optimize) -#---------------------------------------------------------------------------- -VARIANT=optimize -AC_ARG_ENABLE([optimize], [AC_HELP_STRING([--enable-optimize], - [build with optimizations enabled (default YES)])], - [test "$enableval" = "yes" && VARIANT=optimize]) - -AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug], - [build with debugging information (default NO)])], - [test "$enableval" = "yes" && VARIANT=debug]) - -AC_ARG_ENABLE([profile], [AC_HELP_STRING([--enable-profile], - [build with profiling information (default NO)])], - [test "$enableval" = "yes" && VARIANT=profile]) -AC_SUBST([VARIANT]) - -#---------------------------------------------------------------------------- -# find applications -#---------------------------------------------------------------------------- -AC_PROG_CXX -AC_PROG_INSTALL - -#---------------------------------------------------------------------------- -# Check for operating system -#---------------------------------------------------------------------------- -AC_MSG_CHECKING([for target host]) -winapi_available=no -case $host_os in - mingw*|cygwin*) - AC_MSG_RESULT([WIN32]) - winapi_available=yes - AC_DEFINE([USE_WINSOCK], [], [Define if winsock should be used]) - LIBS="$LIBS -lwsock32" - ;; - *) - AC_MSG_RESULT([assume posix]) - AC_DEFINE([USE_POSIX_SOCKETS], [], - [Define if posix sockets should be used]) - - AC_PATH_X - if test "$no_x" != "yes"; then - AC_DEFINE([X11_AVAILABLE], [1], [Defined if X11 is avilable]) - else - AC_MSG_ERROR("Please install X11 libraries and headers.") - fi - ;; -esac - -#---------------------------------------------------------------------------- -# find libraries -#---------------------------------------------------------------------------- -AC_CHECK_HEADERS([glob.h sys/ioctl.h sys/filio.h]) - -AX_TYPE_SOCKLEN_T - -AM_PATH_SDL([1.2.5], - [AC_DEFINE([USE_SDL], [], [Define when SDL should be used])], [ -if test "$winapi_available" != "yes"; then - AC_MSG_ERROR([Please install libsdl >= 1.2.]) -else - AC_DEFINE([USE_WINAPI], [], [Define if win32 API should be used]) -fi -]) - -#AC_CHECK_LIB(SDL_image, IMG_Load, -# LIBS="$LIBS -lSDL_image", -# AC_MSG_ERROR([*** SDL_image library not found!])) - -AC_LANG_PUSH([C++]) -NP_FINDLIB([XERCES], [xerces], [xerces], - NP_LANG_PROGRAM([#include -XERCES_CPP_NAMESPACE_USE;], [XMLPlatformUtils::Initialize();]), - [], [-lxerces-c -lpthread], - [], - [AC_MSG_ERROR([Please install xerces-c])], - [], []) -AC_LANG_POP([C++]) - -NP_FINDLIB([OPENAL], [OpenAL], [OpenAL], - NP_LANG_PROGRAM([#include ], - [alcOpenDevice(0);]), - [], [-lopenal], - [], - [AC_MSG_ERROR([Please install OpenAL])], - [], []) - -NP_FINDLIB([JPEG], [LibJPEG], [LibJPEG], - NP_LANG_PROGRAM([ - #include - #include - #include ], - [jpeg_create_decompress(0);]), - [], [-ljpeg], - [], - [AC_MSG_ERROR([Please install libjpeg])], - [], []) - -NP_FINDLIB([PNG], [LibPng], [LibPNG], - NP_LANG_PROGRAM([#include ], - [png_sig_cmp(0, 0, 8);]), - [], [-lpng], - [], - [AC_MSG_ERROR([Please install libpng])], - [], []) - -NP_FINDLIB([CURL], [LibCurl], [LibCurl], - NP_LANG_PROGRAM([#include ], - [curl_easy_init();]), - [], [-lcurl], - [], - [AC_MSG_ERROR([Please install libcurl])], - [], []) - -#NP_FINDLIB([IRCCLIENT], [LibIrcClient], [LibIrcClient], -# NP_LANG_PROGRAM([#include ], -# []), -# [], [-lircclient], -# [], -# [AC_MSG_ERROR([Please install libircclient])], -# [], []) - -NP_FINDLIB([X11], [LibX11], [LibX11], - NP_LANG_PROGRAM([], - []), - [], [-lX11], - [], - [AC_MSG_ERROR([Please install libX11])], - [], []) - -CHECK_LUA([], [AC_MSG_ERROR([Please install lua 5.1])]) - -AX_CHECK_GL -if test "$no_gl" = "yes"; then - AC_MSG_ERROR([You need to have OpenGL headers and libraries installed]) -fi -AX_CHECK_GLU -if test "$no_glu" = "yes"; then - AC_MSG_ERROR([You need to have GLU headers and libraries installed]) -fi - -XIPH_PATH_VORBIS(, [AC_MSG_ERROR([Please install vorbis])]) -XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install ogg/vorbis])]) - -AM_OPTIONS_WXCONFIG -AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl], [--unicode=yes]) -AC_SUBST([WX_AVAILABLE]) - -AC_INIT_JAM -AC_CONFIG_FILES([Jamconfig]) -AC_OUTPUT - -AC_MSG_NOTICE([ - -Notice: This project uses jam (and not make) as build tool. -]) diff --git a/mk/linux/makedata-diff.sh b/mk/linux/makedata-diff.sh index 6a46f6a9d..2374c4708 100755 --- a/mk/linux/makedata-diff.sh +++ b/mk/linux/makedata-diff.sh @@ -5,7 +5,7 @@ # Below is the old version to compare with. The new version is pulled from # configure.ac -OLD_VERSION=3.3.7 +OLD_VERSION=3.3.7.2 cd release @@ -18,9 +18,9 @@ cd $CURDIR echo "Creating data package $RELEASENAME (comparing against $OLD_VERSION)" -if [ ! -e megaglest-data-$VERSION-changes.txt ]; then - diff --brief -r -x "*~" megaglest-data-$OLD_VERSION megaglest-data-$VERSION > megaglest-data-$VERSION-changes.txt -fi +#if [ ! -e megaglest-data-$VERSION-changes.txt ]; then +diff --strip-trailing-cr --brief -r -x "*~" megaglest-data-$OLD_VERSION megaglest-data-$VERSION > megaglest-data-$VERSION-changes.txt +#fi cd megaglest-data-$VERSION