[paragui-cvs] CVS: paragui configure.in,1.11,1.12

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui
In directory subversions:/tmp/cvs-serv6214

Modified Files:
        configure.in 
Log Message:
updated physfs



Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** configure.in        26 Jun 2002 08:03:53 -0000      1.11
--- configure.in        26 Jun 2002 08:30:10 -0000      1.12
***************
*** 347,358 ****
  
  
! dnl Check for zlib 
  
! have_zlib=no
! AC_CHECK_LIB(z, compress, have_zlib=yes)
! if test x$have_zlib = xno; then
!     AC_MSG_ERROR([*** Unable to find zlib library 
(http://www.info-zip.org/pub/infozip/zlib/)])
  fi
  
  dnl Check for other files
  AC_LANG_CPLUSPLUS
--- 347,400 ----
  
  
! dnl Check for physfs
  
! PHYSFS_INCLUDE=""
! PHYSFS_LIB="-lphysfs"
! PHYSFS_SUBDIR=""
! LIBPHYSFS="-lphysfs"
! 
! internalphysfs=no
! AC_ARG_ENABLE(internalphysfs,
!         [  --enable-internalphysfs enable internal physfs version],
!         internalphysfs=yes
! )
! 
! if test x$internalphysfs = xno; then
! 
!     have_physfs_lib=no
!     have_physfs_include=no
! 
!     AC_CHECK_HEADER(physfs.h, [have_physfs_include=yes])
! 
!     if test x$have_physfs_include = xno; then
!             AC_MSG_ERROR(
!                 [*** Unable to find PhysFS header file! 
(http://www.icculus.org/physfs)]
!                 [Please install the library and header files if you want to 
link to the shared library,]
!                 [or run './configure --enable-internalphysfs' to compile an 
internal version of physfs.]
!                 )
!     fi
! 
!     AC_CHECK_LIB(physfs, PHYSFS_init, have_physfs_lib=yes)
! 
!     if test x$have_physfs_lib = xno; then
!         AC_MSG_ERROR(
!             [*** Unable to find PhysFS library! 
(http://www.icculus.org/physfs)]
!             [Please install the library and header files if you want to link 
to the shared library,]
!             [or run './configure --enable-internalphysfs' to compile an 
internal version of physfs.]
!             )
!     fi
! else
!     AC_CONFIG_SUBDIRS(src/physfs)
!     PHYSFS_INCLUDE="-I\$(srcdir)/../physfs"
!     PHYSFS_LIB="./physfs/libphysfs.la"
!     PHYSFS_SUBDIR="physfs"
!     LIBPHYSFS=""
  fi
  
+ AC_SUBST(PHYSFS_INCLUDE)
+ AC_SUBST(PHYSFS_LIB)
+ AC_SUBST(PHYSFS_SUBDIR)
+ AC_SUBST(LIBPHYSFS)
+ 
  dnl Check for other files
  AC_LANG_CPLUSPLUS
***************
*** 474,479 ****
  AC_CHECK_LIB(tiff,TIFFClose)
  AC_CHECK_LIB(png,png_create_read_struct)
- dnl SYSTEM_LIBS="$SYSTEM_LIBS $LIBS -lz"
- dnl LIBS="$OLDLIBS"
  
  AC_CHECK_FUNCS(vsnprintf)
--- 516,519 ----
***************
*** 487,491 ****
  
  PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS 
$RTTI_FLAGS $EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui2 $SIGC_LIBS $SDL_LIBS -lz $IMAGE_LIBS $LIBEXPAT 
$FREETYPE_LIBS $EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"
--- 527,531 ----
  
  PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS 
$RTTI_FLAGS $EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui2 $SIGC_LIBS $SDL_LIBS $LIBPHYSFS $IMAGE_LIBS 
$LIBEXPAT $FREETYPE_LIBS $EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"