[paragui-cvs] CVS: paragui autogen.sh,1.1.1.1,1.1.1.1.6.1 configure.in,1.3.6.5,1.3.6.6

[Alexander Pipelka <address@hidden>]

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

Modified Files:
      Tag: devel-1-0
        autogen.sh configure.in 
Log Message:
integrated new PhysFS into build system



Index: autogen.sh
===================================================================
RCS file: /cvsroot/paragui/paragui/autogen.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -r1.1.1.1 -r1.1.1.1.6.1
*** autogen.sh  15 Apr 2002 13:22:10 -0000      1.1.1.1
--- autogen.sh  21 Jun 2002 21:13:39 -0000      1.1.1.1.6.1
***************
*** 26,29 ****
--- 26,32 ----
  autoconf || ( echo "***ERROR*** autoconf failed." ; exit 1 )
  
+ echo "Bootstrapping physfs ..."
+ cd src/physfs && ./bootstrap
+ 
  echo "Running autogen.sh in the \"test\" directory ..."
  cp -f paragui.m4 test/acinclude.m4

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.3.6.5
retrieving revision 1.3.6.6
diff -C2 -r1.3.6.5 -r1.3.6.6
*** configure.in        20 Jun 2002 14:35:32 -0000      1.3.6.5
--- configure.in        21 Jun 2002 21:13:39 -0000      1.3.6.6
***************
*** 520,524 ****
  AC_CHECK_LIB(tiff,TIFFClose)
  AC_CHECK_LIB(png,png_create_read_struct)
! dnl SYSTEM_LIBS="$SYSTEM_LIBS $LIBS -lz"
  dnl LIBS="$OLDLIBS"
  
--- 520,524 ----
  AC_CHECK_LIB(tiff,TIFFClose)
  AC_CHECK_LIB(png,png_create_read_struct)
! dnl SYSTEM_LIBS="$SYSTEM_LIBS $LIBS"
  dnl LIBS="$OLDLIBS"
  
***************
*** 529,533 ****
  
  PARAGUI_CFLAGS="$STL_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS $RTTI_FLAGS 
$EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui $SDL_LIBS -lz $IMAGE_LIBS $LIBEXPAT $FREETYPE_LIBS 
$EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"
--- 529,533 ----
  
  PARAGUI_CFLAGS="$STL_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS $RTTI_FLAGS 
$EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui $SDL_LIBS $IMAGE_LIBS $LIBEXPAT $FREETYPE_LIBS 
$EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"
***************
*** 550,553 ****
--- 550,556 ----
  AC_SUBST(RPM_ROOT)
  
+ echo "Running configure for PhysFS ..."
+ AC_CONFIG_SUBDIRS(src/physfs)
+ 
  # Finally create all the generated files
  AC_OUTPUT([
***************
*** 556,562 ****
  include/Makefile
  src/Makefile
- src/physfs/Makefile
- src/physfs/archivers/Makefile
- src/physfs/platform/Makefile
  src/expat/Makefile
  src/draw/Makefile
--- 559,562 ----