From 527b665a3859064a50a718c7ddea7f34100da14c Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Thu, 2 Dec 2004 18:30:54 +0000 Subject: [PATCH] require PhysicsFS header and library --- ChangeLog | 4 ++++ configure.ac | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bef7c53..3c4e0fa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-02 Martin Schaffner + + * configure.ac: require PhysicsFS header and library + 2004-12-02 Chris Taylor * main/bm.c, main/piggy.c: fix cfile bugs from recent changes diff --git a/configure.ac b/configure.ac index 8aa38792..b6399ed7 100644 --- a/configure.ac +++ b/configure.ac @@ -189,22 +189,24 @@ else AC_CHECK_HEADERS(netipx/ipx.h) # Check for SDL_image - AC_CHECK_LIB(SDL_image, IMG_ReadXPMFromArray, - LIBS="-lSDL_image $LIBS" - AC_DEFINE(SDL_IMAGE,,[Define if you have the SDL_image library])) + AC_CHECK_LIB(SDL_image, IMG_ReadXPMFromArray, + LIBS="-lSDL_image $LIBS" + AC_DEFINE(SDL_IMAGE,,[Define if you have the SDL_image library])) # Check for libpng - have_libpng=no - #PKG_CHECK_MODULES(LIBPNG, libpng, - # AC_DEFINE(HAVE_LIBPNG,,[Define if you have libpng]) - # have_libpng=yes - # LIBS="$LIBPNG_LIBS $LIBS", - # AC_MSG_WARN([libpng not found. disabling png replacement texture support]) + have_libpng=no + #PKG_CHECK_MODULES(LIBPNG, libpng, + # AC_DEFINE(HAVE_LIBPNG,,[Define if you have libpng]) + # have_libpng=yes + # LIBS="$LIBPNG_LIBS $LIBS", + # AC_MSG_WARN([libpng not found. disabling png replacement texture support]) #) - AM_CONDITIONAL(USE_LIBPNG, test x$have_libpng = xyes) + AM_CONDITIONAL(USE_LIBPNG, test x$have_libpng = xyes) # Check for PhysicsFS - AC_CHECK_LIB(physfs, PHYSFS_init, LIBS="-lphysfs $LIBS") + AC_CHECK_HEADERS(physfs.h, , [AC_MSG_ERROR([physfs.h required])]) + AC_CHECK_LIB(physfs, PHYSFS_init, LIBS="-lphysfs $LIBS", + [AC_MSG_ERROR([physfs library required])]) # Check for OpenGL AC_ARG_WITH(opengl, -- 2.39.2