[Groundstation-commits] CVS: gpredict configure.in,1.38,1.39

[Alexandru C. <cs...@us...>]

Update of /cvsroot/groundstation/gpredict
In directory usw-pr-cvs1:/tmp/cvs-serv1453

Modified Files:
	configure.in 
Log Message:
gdk-pixbuf, gnome-print, gal and gnome-vfs are now required.

Index: configure.in
===================================================================
RCS file: /cvsroot/groundstation/gpredict/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** configure.in	22 Feb 2002 13:48:15 -0000	1.38
--- configure.in	22 Feb 2002 15:54:21 -0000	1.39
***************
*** 1,6 ****
! dnl configure.in for Gnome Predict.
! dnl Process this file with autoconf to produce a configure script.
! dnl This file is based on the template that comes with Glade.
! dnl Modified by Alexandru Csete
  
  AC_INIT(configure.in)
--- 1,11 ----
! dnl*******************************************************************
! dnl*  configure.in for Gnome Predict.
! dnl*  Process this file with autoconf to produce a configure script.
! dnl*  This file is based on the template that comes with Glade.
! dnl*  Then inspired by mrproject.
! dnl*  Then modified by Alexandru Csete
! dnl********************************************************************
! 
! 
  
  AC_INIT(configure.in)
***************
*** 8,11 ****
--- 13,44 ----
  AM_CONFIG_HEADER(config.h)
  
+ 
+ 
+ # Borrowed from MrProject who borrowed from Evolution
+ AC_DEFUN(EVO_CHECK_LIB, [
+ 	dispname="$1"
+ 	dispvers="$2"
+ 	pkgname="$3"
+ 
+ 	AC_MSG_CHECKING(for $dispname >= $dispvers)
+ 	cmpvers=`echo $dispvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`
+ 	if gnome-config --libs $pkgname > /dev/null 2>&1; then
+ 		pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[[^0-9]]*//'`
+ 	else
+ 		pkgvers=not
+ 	fi
+ 	AC_MSG_RESULT($pkgvers found)
+ 
+ 	pkgvers=`echo $pkgvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`
+ 	if test "$pkgvers" -lt $cmpvers; then
+ 	AC_MSG_ERROR([
+ ""
+ "You need $dispname $dispvers or later to build Gnome Predict"
+ "If you think you already have this installed, consult the README."])
+ 	fi
+ ])
+ 
+ 
+ 
  dnl Pick up the Gnome macros.
  AM_ACLOCAL_INCLUDE(macros)
***************
*** 27,55 ****
  
  
  dnl FIX THIS!!!!
! AM_PATH_GDK_PIXBUF(0.8.0, AC_DEFINE(HAVE_GDK_PIXBUF),
!  	AC_MSG_WARN([No gdk-pixbuf found -> NO KOOL GRAPHICS!]))
  
  
! AM_PATH_GNOME_PRINT(0.25.0,
! 	AC_DEFINE(HAVE_GNOME_PRINT) PRINTFLAGS=print PRINTLIBS=print,
! 	AC_MSG_WARN([No gnome-print! Printing disabled!]))
  
  
  
  
! dnl
! dnl check for HAMLIB
! dnl
  AC_CHECK_LIB(hamlib,main,,AC_MSG_WARN([hamlib library not found! RIG controls disabled]))
  AC_CHECK_HEADERS(hamlib/rig.h hamlib/riglist.h,,AC_MSG_WARN([hamlib header(s) not found! RIG control disabled]) AC_DEFINE(HAVE_LIBHAMLIB,0))
  
- dnl AC_LIB_HAMLIB(1.1.2,,AC_MSG_WARN([hamlib-1.1.2 or later not found! RIG controls are disabled!]))
- 
  
! dnl EXTRA_GNOME_CFLAGS=`gnome-config --cflags gdk_pixbuf gnomeui print`
! EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui $PRINTFLAGS gal vfs`
! dnl EXTRA_GNOME_LIBS=`gnome-config --libs gdk_pixbuf gnomeui print`
! EXTRA_GNOME_LIBS=`gnome-config --libs gnome gnomeui $PRINTLIBS gal vfs`
  AC_SUBST(EXTRA_GNOME_CFLAGS)
  AC_SUBST(EXTRA_GNOME_LIBS)
--- 60,92 ----
  
  
+ dnl***********************
+ dnl  Check for libraries
+ dnl***********************
+ EVO_CHECK_LIB(gdk-pixbuf with GNOME canvas support, 0.8, gnomecanvaspixbuf)
+ EVO_CHECK_LIB(GAL, 0.11, gal)
+ EVO_CHECK_LIB(GnomeVFS, 1.0.0, vfs)
+ EVO_CHECK_LIB(gnome-print, 0.25, print)
+ 
  dnl FIX THIS!!!!
! dnl AM_PATH_GDK_PIXBUF(0.8.0, AC_DEFINE(HAVE_GDK_PIXBUF),
! dnl  	AC_MSG_WARN([No gdk-pixbuf found -> NO KOOL GRAPHICS!]))
  
  
! dnl AM_PATH_GNOME_PRINT(0.25.0,
! dnl 	AC_DEFINE(HAVE_GNOME_PRINT) PRINTFLAGS=print PRINTLIBS=print,
! dnl	AC_MSG_WARN([No gnome-print! Printing disabled!]))
  
  
  
  
! dnl********************
! dnl  check for HAMLIB
! dnl********************
  AC_CHECK_LIB(hamlib,main,,AC_MSG_WARN([hamlib library not found! RIG controls disabled]))
  AC_CHECK_HEADERS(hamlib/rig.h hamlib/riglist.h,,AC_MSG_WARN([hamlib header(s) not found! RIG control disabled]) AC_DEFINE(HAVE_LIBHAMLIB,0))
  
  
! EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui print gdk_pixbuf gnomecanvaspixbuf gal vfs`
! EXTRA_GNOME_LIBS=`gnome-config --libs gnome gnomeui print gdk_pixbuf gnomecanvaspixbuf gal vfs`
  AC_SUBST(EXTRA_GNOME_CFLAGS)
  AC_SUBST(EXTRA_GNOME_LIBS)