[paragui-cvs] CVS: paragui autogen.sh,1.2.2.4,1.2.2.5 configure.in,1.8.2.13,1.8.2.14

[Alexander Pipelka <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        autogen.sh configure.in 
Log Message:
added libsigc++ 1.2.3 (building statically linked versions, Win32)
physfs autoconf / automake fixes



Index: autogen.sh
===================================================================
RCS file: /cvsroot/paragui/paragui/autogen.sh,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** autogen.sh  3 Feb 2003 20:41:40 -0000       1.2.2.4
--- autogen.sh  4 Feb 2003 00:08:15 -0000       1.2.2.5
***************
*** 11,14 ****
--- 11,21 ----
  cd $TOPDIR
  
+ echo
+ echo "Bootstrapping libsigc++ ..."
+ 
+ cd ./src/libsigc++
+ ./autogen.sh
+ cd $TOPDIR
+ 
  echo "Bootstrapping Plugins ..."
  echo "... pango"

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.8.2.13
retrieving revision 1.8.2.14
diff -C2 -r1.8.2.13 -r1.8.2.14
*** configure.in        3 Feb 2003 21:47:08 -0000       1.8.2.13
--- configure.in        4 Feb 2003 00:08:15 -0000       1.8.2.14
***************
*** 214,221 ****
  
  dnl Check for libSigC++
! PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
  AC_SUBST(SIGC_CFLAGS)
  AC_SUBST(SIGC_LIBS)
! 
  
  dnl Check for SDL
--- 214,246 ----
  
  dnl Check for libSigC++
! 
! SIGC_LIBS=""
! SIGC_SUBDIR=""
! SIGC_CFLAGS=""
! LIBSIGC="-lsigc++"
! 
! internalsigc=no
! AC_ARG_ENABLE(internalsigc,
!       [  --enable-internalsigc enable internal LibSigC++ version],
!       internalsigc=yes
! )
! 
! if test x$internalsigc = xno; then
! 
!     PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
!     
! else
!     SIGC_CFLAGS="-I\$(srcdir)/../libsigc++/sigc++/config 
-I\$(srcdir)/../libsigc++"
!     SIGC_LIBS="./libsigc++/sigc++/libsigc-1.2.la"
!     SIGC_SUBDIR="libsigc++"
!     LIBSIGC=""
! fi
! 
! AC_CONFIG_SUBDIRS(src/libsigc++)
! 
  AC_SUBST(SIGC_CFLAGS)
  AC_SUBST(SIGC_LIBS)
! AC_SUBST(SIGC_SUBDIR)
! AC_SUBST(LIBSIGC)
  
  dnl Check for SDL
***************
*** 373,380 ****
  fi
  
- dnl is this correct?
  AC_CONFIG_SUBDIRS(src/physfs)
- dnl oops nope - disable pango for now...
- dnl plugins/pango
  
  AC_SUBST(PHYSFS_INCLUDE)
--- 398,402 ----
***************
*** 866,870 ****
  
  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"
--- 888,892 ----
  
  PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS 
$RTTI_FLAGS $EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui2 $LIBSIGC $SDL_LIBS $LIBPHYSFS $IMAGE_LIBS $LIBEXPAT 
$FREETYPE_LIBS $EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS"