[Gcx-discussion] gcx configure.ac,1.5,1.6

[Matei C. <cm...@us...>]

Update of /cvsroot/gcx/gcx
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9885

Modified Files:
	configure.ac 
Log Message:
Merge my modifications to CVS

Index: configure.ac
===================================================================
RCS file: /cvsroot/gcx/gcx/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.ac	3 Dec 2011 21:48:07 -0000	1.5
--- configure.ac	7 Mar 2013 20:49:33 -0000	1.6
***************
*** 1,4 ****
  
! AC_INIT([gcx], [1.5])
  AM_INIT_AUTOMAKE([foreign -Wall -Werror])
  
--- 1,4 ----
  
! AC_INIT([gcx], [1.6])
  AM_INIT_AUTOMAKE([foreign -Wall -Werror])
  
***************
*** 12,15 ****
--- 12,16 ----
  AC_PROG_RANLIB
  
+ PKG_PROG_PKG_CONFIG()
  
  AC_CHECK_HEADERS(libgen.h)
***************
*** 19,26 ****
  
  
! AM_PATH_GTK_2_0(2.20.0, , AC_MSG_ERROR(Cannot find GTK: is pkg-config in path?))
  AC_CHECK_HEADERS([zlib.h])
! AC_CHECK_LIB(z, inflate)
  
  
  AC_CONFIG_FILES([
--- 20,33 ----
  
  
! AM_PATH_GTK_2_0(2.20.0, , AC_MSG_ERROR(Cannot find GTK >= 2.20.0))
! 
  AC_CHECK_HEADERS([zlib.h])
! AC_CHECK_LIB(z, inflate,,AC_MSG_ERROR(Cannot find zlib))
  
+ AC_CHECK_HEADERS([tiff.h])
+ AC_CHECK_LIB(tiff, TIFFOpen,,AC_MSG_ERROR(Cannot find libtiff))
+ 
+ AC_CHECK_HEADERS([jpeglib.h])
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress,,AC_MSG_ERROR(Cannot find libjpeg))
  
  AC_CONFIG_FILES([
***************
*** 31,33 ****
  ])
  AC_OUTPUT
- 
--- 38,39 ----