[paragui-cvs] CVS: paragui configure.in,1.1.1.1,1.2

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        configure.in 
Log Message:
imported version 1.0.1



Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** configure.in        15 Apr 2002 13:22:10 -0000      1.1.1.1
--- configure.in        15 Apr 2002 13:31:29 -0000      1.2
***************
*** 21,27 ****
  PARAGUI_MAJOR_VERSION=1
  PARAGUI_MINOR_VERSION=0
! PARAGUI_MICRO_VERSION=0
  PARAGUI_INTERFACE_AGE=0
! PARAGUI_BINARY_AGE=0
  
PARAGUI_VERSION=$PARAGUI_MAJOR_VERSION.$PARAGUI_MINOR_VERSION.$PARAGUI_MICRO_VERSION
  
--- 21,27 ----
  PARAGUI_MAJOR_VERSION=1
  PARAGUI_MINOR_VERSION=0
! PARAGUI_MICRO_VERSION=1
  PARAGUI_INTERFACE_AGE=0
! PARAGUI_BINARY_AGE=1
  
PARAGUI_VERSION=$PARAGUI_MAJOR_VERSION.$PARAGUI_MINOR_VERSION.$PARAGUI_MICRO_VERSION
  
***************
*** 146,150 ****
          fi
        CROSSCOMPILE=YES
!       PHYSFS_PLATFORMFILE=platform/unix.c
        ;;
      *-*-darwin*)
--- 146,150 ----
          fi
        CROSSCOMPILE=YES
!       PHYSFS_PLATFORMFILE=platform/win32.c
        ;;
      *-*-darwin*)
***************
*** 234,239 ****
  )
  
! SDL_LIBS=`sdl-config --libs`
! AC_SUBST(SDL_LIBS)
  
  dnl set default prefix to `sdl-config --prefix`
--- 234,239 ----
  )
  
! dnl SDL_LIBS=`sdl-config --libs`
! dnl AC_SUBST(SDL_LIBS)
  
  dnl set default prefix to `sdl-config --prefix`
***************
*** 244,249 ****
  AC_SUBST(SDL_PREFIX)
  
- LIBS="$SDL_LIBS $LIBS"
- 
  ft2test=yes
  AC_ARG_ENABLE(ft2test,
--- 244,247 ----
***************
*** 262,266 ****
        have_freetype=yes
        FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
!       LIBS="$LIBS `$ac_cv_path_freetype_config --libs`"
      else
        AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
--- 260,264 ----
        have_freetype=yes
        FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
!       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
      else
        AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
***************
*** 269,273 ****
            have_freetype="no"
        elif test "$have_freetype" = "yes"; then
!           LIBS="$LIBS -lfreetype"
            ft2inc="no"
            AC_MSG_CHECKING(freetype2 include directory)
--- 267,271 ----
            have_freetype="no"
        elif test "$have_freetype" = "yes"; then
!           FREETYPE_LIBS="-lfreetype"
            ft2inc="no"
            AC_MSG_CHECKING(freetype2 include directory)
***************
*** 292,310 ****
  dnl Check for expat
  
! have_expat_lib=no
! have_expat_include=no
  
! AC_CHECK_LIB(expat, XML_ParserCreate, have_expat_lib=yes)
  
! if test x$have_expat_lib = xno; then
!     AC_MSG_ERROR([*** Unable to find expat xml library! 
(http://expat.sourceforge.net)])
! fi
  
! AC_CHECK_HEADER(expat.h, [have_expat_include=yes])
  
! if test x$have_expat_include = xno; then
!       AC_MSG_ERROR([*** Unable to find expat header! 
(http://expat.sourceforge.net)])
  fi
  
  
  dnl Check for zlib 
--- 290,340 ----
  dnl Check for expat
  
! EXPAT_INCLUDE=""
! EXPAT_LIB="-lexpat"
! EXPAT_SUBDIR=""
! LIBEXPAT="-lexpat"
! 
! internalexpat=no
! AC_ARG_ENABLE(internalexpat,
!       [  --enable-internalexpat  enable internal expat version],
!       internalexpat=yes
! )
  
! if test x$internalexpat = xno; then
  
!     have_expat_lib=no
!     have_expat_include=no
! 
!     AC_CHECK_HEADER(expat.h, [have_expat_include=yes])
! 
!     if test x$have_expat_include = xno; then
!           AC_MSG_ERROR(
!               [*** Unable to find expat header file! 
(http://expat.sourceforge.net)]
!               [Please install the library and header files if you want to 
link to the shared library,]
!               [or run './configure --enable-internalexpat' to compile an 
internal version of expat.] 
!               )
!     fi
  
!     AC_CHECK_LIB(expat, XML_ParserCreate, have_expat_lib=yes)
  
!     if test x$have_expat_lib = xno; then
!       AC_MSG_ERROR(
!           [*** Unable to find expat xml library! 
(http://expat.sourceforge.net)]
!           [Please install the library and header files if you want to link to 
the shared library,]
!           [or run './configure --enable-internalexpat' to compile an internal 
version of expat.] 
!           )
!     fi
! else
!     EXPAT_INCLUDE="-I\$(srcdir)/../expat"
!     EXPAT_LIB="./expat/libexpat.la"
!     EXPAT_SUBDIR="expat"
!     LIBEXPAT=""
  fi
  
+ AC_SUBST(EXPAT_INCLUDE)
+ AC_SUBST(EXPAT_LIB)
+ AC_SUBST(EXPAT_SUBDIR)
+ AC_SUBST(LIBEXPAT)
+ 
  
  dnl Check for zlib 
***************
*** 388,395 ****
  
  dnl Check for SDL_image
- SDL_IMAGE_LIBS="`sdl-config --libs`"
  
  have_SDL_image=no
! AC_CHECK_LIB(SDL_image, IMG_Load, have_SDL_image=yes, have_SDL_image=no, 
$SDL_IMAGE_LIBS)
  if test x$have_SDL_image = xno; then
      AC_MSG_RESULT([disable SDL_image support])
--- 418,424 ----
  
  dnl Check for SDL_image
  
  have_SDL_image=no
! AC_CHECK_LIB(SDL_image, IMG_Load, have_SDL_image=yes, have_SDL_image=no)
  if test x$have_SDL_image = xno; then
      AC_MSG_RESULT([disable SDL_image support])
***************
*** 485,496 ****
  # Unfortunately libs like jpeg and png will be missing still so we check
  # for those manually.
! if test "$SDL_CONFIG" != ""; then
!    SYSTEM_LIBS=`$SDL_CONFIG --static-libs | sed s:"$($SDL_CONFIG --libs)"::`
! fi
  AC_CHECK_LIB(jpeg,jpeg_read_header)
  AC_CHECK_LIB(tiff,TIFFClose)
  AC_CHECK_LIB(png,png_create_read_struct)
! SYSTEM_LIBS="$SYSTEM_LIBS $LIBS -lz"
! LIBS="$OLDLIBS"
  
  AC_CHECK_FUNCS(vsnprintf)
--- 514,525 ----
  # Unfortunately libs like jpeg and png will be missing still so we check
  # for those manually.
! dnl if test "$SDL_CONFIG" != ""; then
! dnl    SYSTEM_LIBS=`$SDL_CONFIG --static-libs | sed s:"$($SDL_CONFIG 
--libs)"::`
! dnl fi
  AC_CHECK_LIB(jpeg,jpeg_read_header)
  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)
***************
*** 498,502 ****
  
  PARAGUI_CFLAGS="$STL_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS $RTTI_FLAGS 
$EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui $LIBS $IMAGE_LIBS $SDL_LIBS -lexpat  -lz $LIBSTDCPP 
$EXTRA_LIBS"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"
--- 527,531 ----
  
  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"
***************
*** 527,530 ****
--- 556,560 ----
  src/physfs/archivers/Makefile
  src/physfs/platform/Makefile
+ src/expat/Makefile
  src/draw/Makefile
  src/font/Makefile