--- csmash-0.6.6/configure.in.cflags 2003-08-16 07:53:55.000000000 +0200 +++ csmash-0.6.6/configure.in 2017-09-12 03:58:32.586099141 +0200 @@ -19,10 +19,6 @@ AC_PATH_X -CFLAGS="-I $x_includes" -LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir" -CXXFLAGS="$CFLAGS -Wall" - dnl Checks for libraries. AC_CHECK_LIB(Xmu, main) AC_CHECK_LIB(Xt, main) @@ -36,21 +32,12 @@ AC_CHECK_LIB(z, gzdopen) dnl Check for SDL -SDL_VERSION=1.2.0 -AM_PATH_SDL($SDL_VERSION, - :, - AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) -) -CFLAGS="$CFLAGS $SDL_CFLAGS" -CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -LIBS="$LIBS $SDL_LIBS" +PKG_CHECK_MODULES(SDL, sdl >= 1.2.0) AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio) AC_CHECK_LIB(SDL_image, IMG_Load, ,AC_MSG_ERROR(SDL_image not found)) -AM_PATH_GTK_2_0(2.0.0, [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"], ) -dnl AM_PATH_GTK( 2.0.0, [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"], ) -dnl PKG_CHECK_MODULES(CSMASH, gtk+-2.0 >= 1.3, [CFLAGS="$CFLAGS $CSMASH__CFLAGS" CPPFLAGS="$CPPFLAGS $CSMASH_CFLAGS" LIBS="$LIBS $CSMASH_LIBS"], ) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0) if test x$ac_cv_lib_z_gzdopen = xyes; then PKGDATA=.gz @@ -76,14 +63,6 @@ fi -case "$target" in - *-*-cygwin* | *-*-mingw32*) - LIBS="$LIBS -lws2_32 -liberty" - CFLAGS="$CFLAGS -fnative-struct" - CPPFLAGS="$CPPFLAGS -fnative-struct" - ;; -esac - dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for library functions. --- csmash-0.6.6/Makefile.am.cflags 2003-01-10 16:02:49.000000000 +0100 +++ csmash-0.6.6/Makefile.am 2017-09-12 04:03:37.372878997 +0200 @@ -37,6 +37,8 @@ PlayerView2D.h BallView2D.h PlayerSelectView2D.h \ TitleView2D.h MenuItemView2D.h RCFile.h loadparts.h \ LobbyClientView.h LauncherView.h MultiPlayerSelect.h +csmash_CPPFLAGS = $(GTK_CFLAGS) +csmash_LDADD = $(SDL_LIBS) $(GTK_LIBS) DEFS = -DLOCALEDIR=\"$(localedir)\" -DCANNONSMASH_DATADIR=\"$(pkgdatadir)\" @DEFS@ LIBS = @LIBINTL@ @LIBS@
