[q-lang-cvs] q ChangeLog,1.3,1.4 configure.in,1.2,1.3

[<ag...@us...>]

Update of /cvsroot/q-lang/q
In directory sc8-pr-cvs1:/tmp/cvs-serv655

Modified Files:
	ChangeLog configure.in 
Log Message:
Added magick module

Index: ChangeLog
===================================================================
RCS file: /cvsroot/q-lang/q/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog	16 Dec 2003 10:53:50 -0000	1.3
--- ChangeLog	16 Dec 2003 19:11:16 -0000	1.4
***************
*** 1,6 ****
  2003-12-16  Albert Graef  <Dr....@t-...>
  
  	* README, NEWS: bump version to 4.6, add a NEWS entry for ongoing
! 	development for the 4.6 release
  
  2003-12-14  Albert Graef  <Dr....@t-...>
--- 1,14 ----
  2003-12-16  Albert Graef  <Dr....@t-...>
  
+ 	* README: add information on ImageMagick support
+ 
+ 	* magick: added ImageMagick module
+ 
+ 	* configure.in, modules/ggi/Makefile.am: fixed some ggi-related
+ 	quirks in configury
+ 
  	* README, NEWS: bump version to 4.6, add a NEWS entry for ongoing
! 	development for the 4.6 release, add pointers to the q-lang
! 	SourceForge project
  
  2003-12-14  Albert Graef  <Dr....@t-...>

Index: configure.in
===================================================================
RCS file: /cvsroot/q-lang/q/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	15 Dec 2003 12:07:13 -0000	1.2
--- configure.in	16 Dec 2003 19:11:16 -0000	1.3
***************
*** 264,267 ****
--- 264,304 ----
  AC_SUBST(GGI_INCLUDES)
  
+ # ImageMagick
+ 
+ MAGICK_LIBS="yes"
+ AC_ARG_WITH(magick,
+   [  --with-magick[[=LIBS]]    use the ImageMagick library (magick module)],
+   [case "${withval}" in
+     no)  MAGICK_LIBS="" ;;
+     *) MAGICK_LIBS="${withval}" ;;
+   esac])
+ if test "${MAGICK_LIBS}" = "yes"; then
+   MAGICK_LIBS=""
+   AC_CHECK_LIB(Magick, InitializeMagick, [ MAGICK_LIBS="-lMagick" ])
+   if test "${MAGICK_LIBS}" = ""; then
+     AC_MSG_WARN([could not find the ImageMagick library, skipping the magick module])
+   else
+     AC_MSG_RESULT([defining MAGICK_LIBS to be ${MAGICK_LIBS}])
+   fi
+ fi
+ AM_CONDITIONAL(MAGICK, test "${MAGICK_LIBS}" != "")
+ AC_SUBST(MAGICK_LIBS)
+ if test "${MAGICK_LIBS}" != ""; then
+   MAGICK_MODULE='-dlopen $(top_srcdir)/modules/magick/magick.la'
+ else
+   MAGICK_MODULE=""
+ fi
+ AC_SUBST(MAGICK_MODULE)
+ 
+ MAGICK_INCLUDES=""
+ AC_ARG_WITH(magick-includes,
+   [  --with-magick-includes=INC extra includes for the ImageMagick library],
+   [case "${withval}" in
+     yes) MAGICK_INCLUDES="" ;;
+     no)  MAGICK_INCLUDES="" ;;
+     *) MAGICK_INCLUDES="${withval}" ;;
+   esac])
+ AC_SUBST(MAGICK_INCLUDES)
+ 
  # ODBC
  
***************
*** 509,517 ****
--- 546,557 ----
  AC_CHECK_FUNCS(gethostname gethostbyname gethostbyaddr gethostent getprotobyname getprotobynumber getprotoent getservbyname getservbyport getservent inet_aton)
  dnl pthread stuff
+ OLDLIBS=$LIBS
  LIBS="$LIBS $LIBPTHREAD"
  AC_CHECK_FUNCS(pthread_atfork)
+ LIBS=$OLDLIBS
  dnl ggi buffer support
  LIBS="$LIBS ${GGI_LIBBUF}"
  AC_CHECK_FUNCS(ggiBufInit)
+ LIBS=$OLDLIBS
  
  dnl Configure readline support.
***************
*** 576,580 ****
  dnl Output.
  
! AC_OUTPUT(Makefile doc/Makefile etc/Makefile examples/Makefile libq/Makefile modules/Makefile modules/clib/Makefile modules/clib/examples/Makefile modules/dxl/Makefile modules/dxl/examples/Makefile modules/gdbm/Makefile modules/gdbm/examples/Makefile modules/ggi/Makefile modules/ggi/examples/Makefile modules/octave/Makefile modules/odbc/Makefile modules/odbc/examples/Makefile modules/tk/Makefile modules/tk/examples/Makefile src/Makefile stdlib/Makefile)
  
  dnl Brief summary.
--- 616,620 ----
  dnl Output.
  
! AC_OUTPUT(Makefile doc/Makefile etc/Makefile examples/Makefile libq/Makefile modules/Makefile modules/clib/Makefile modules/clib/examples/Makefile modules/dxl/Makefile modules/dxl/examples/Makefile modules/gdbm/Makefile modules/gdbm/examples/Makefile modules/ggi/Makefile modules/ggi/examples/Makefile modules/magick/Makefile modules/magick/examples/Makefile modules/octave/Makefile modules/odbc/Makefile modules/odbc/examples/Makefile modules/tk/Makefile modules/tk/examples/Makefile src/Makefile stdlib/Makefile)
  
  dnl Brief summary.
***************
*** 622,629 ****
  fi
  if test "${GGI_LIBS}" != ""; then
! AC_MSG_RESULT([  GGI:                  libraries: ${GGI_LIBS}] ${GGI_LIBBUF})
  AC_MSG_RESULT([                        includes : ${GGI_INCLUDES}])
  else
  AC_MSG_RESULT([  GGI:                  disabled])
  fi
  if test "${ODBC_LIBS}" != ""; then
--- 662,675 ----
  fi
  if test "${GGI_LIBS}" != ""; then
! AC_MSG_RESULT([  GGI:                  libraries: ${GGI_LIBS} ${GGI_LIBBUF}])
  AC_MSG_RESULT([                        includes : ${GGI_INCLUDES}])
  else
  AC_MSG_RESULT([  GGI:                  disabled])
+ fi
+ if test "${MAGICK_LIBS}" != ""; then
+ AC_MSG_RESULT([  ImageMagick:          libraries: ${MAGICK_LIBS}])
+ AC_MSG_RESULT([                        includes : ${MAGICK_INCLUDES}])
+ else
+ AC_MSG_RESULT([  ImageMagick:          disabled])
  fi
  if test "${ODBC_LIBS}" != ""; then