[paragui-cvs] CVS: paragui Makefile.am,1.1.1.1.6.3,1.1.1.1.6.4 configure.in,1.3.6.7,1.3.6.8

[Alexander Pipelka <address@hidden>]

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

Modified Files:
      Tag: devel-1-0
        Makefile.am configure.in 
Log Message:
made physfs optional (like expat)



Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/Makefile.am,v
retrieving revision 1.1.1.1.6.3
retrieving revision 1.1.1.1.6.4
diff -C2 -r1.1.1.1.6.3 -r1.1.1.1.6.4
*** Makefile.am 12 Jun 2002 06:20:53 -0000      1.1.1.1.6.3
--- Makefile.am 25 Jun 2002 09:14:20 -0000      1.1.1.1.6.4
***************
*** 8,11 ****
--- 8,12 ----
  
  EXTRA_DIST = \
+       acconfig.h \
        paragui.m4 \
        paragui.spec.in \

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.3.6.7
retrieving revision 1.3.6.8
diff -C2 -r1.3.6.7 -r1.3.6.8
*** configure.in        23 Jun 2002 09:11:48 -0000      1.3.6.7
--- configure.in        25 Jun 2002 09:14:20 -0000      1.3.6.8
***************
*** 8,13 ****
  AC_SUBST(TOP_BUILDDIR)
  
- AC_CONFIG_SUBDIRS(src/physfs)
- 
  dnl The minimum SDL version required
  SDL_VERSION=1.2.0
--- 8,11 ----
***************
*** 323,335 ****
  AC_SUBST(LIBEXPAT)
  
  
! 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
--- 321,375 ----
  AC_SUBST(LIBEXPAT)
  
+ 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