"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
sip-0.5.6.tar.gz and sip-0.12.1.tar.gz

About: SIP (Scilab Image Processing) toolbox to do imaging tasks such as filtering, blurring, edge detection, thresholding, histogram manipulation, segmentation, mathematical morphology, color image processing, etc.

configure.ac  (sip-0.5.6):configure.ac  (sip-0.12.1)
skipping to change at line 22 skipping to change at line 22
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
AC_PREREQ(2.61) AC_PREREQ(2.69)
#AC_INIT([sip], [20040710-2], [ricardofabbri@users.sf.net],[sip-dev]) #AC_INIT([sip], [20040710-2], [ricardofabbri@users.sf.net],[sip-dev])
AC_INIT([sip], [0.5.6], [ricardofabbri@users.sourceforge.net]) AC_INIT([sip], [0.12.1], [ricardofabbri@users.sourceforge.net])
echo "configuring SIP AC_PACKAGE_VERSION" echo "configuring SIP AC_PACKAGE_VERSION"
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/imread.c]) AC_CONFIG_SRCDIR([src/imread.c])
AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_HEADER([src/config.h])
AX_PREFIX_CONFIG_H([src/sip_config.h],[sip]) AX_PREFIX_CONFIG_H([src/sip_config.h],[sip])
AM_INIT_AUTOMAKE([no-define]) AM_INIT_AUTOMAKE([no-define])
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
skipping to change at line 72 skipping to change at line 72
;; ;;
esac esac
AC_CHECK_PROG([has_scilab],[scilab],[yes],[no], , ) AC_CHECK_PROG([has_scilab],[scilab],[yes],[no], , )
if test x$has_scilab = xno; then if test x$has_scilab = xno; then
AC_MSG_ERROR([[Scilab was not found in your PATH], your PATH is $PATH]) AC_MSG_ERROR([[Scilab was not found in your PATH], your PATH is $PATH])
fi fi
SCIEXE="scilab" SCIEXE="scilab"
# test if SCI is defined. If not, test if scilab is in path, # test if SCI is defined. If not, test if scilab is in path,
# then get SCI from scilab -nwni. # then get SCI from scilab -nw
if test -z "$SCI"; then if test -z "$SCI"; then
cmd='F=mopen("getpath.incl","w"); cmd='F=mopen("getpath.incl","w");
mfprintf(F,SCI); mfprintf(F,SCI);
mclose(F);exit;' mclose(F);exit;'
echo "$cmd" > getpath.sci echo "$cmd" > getpath.sci
scilab -nw -f getpath.sci >/dev/null scilab -nwni -nb -nouserstartup -f getpath.sci # >/dev/null
SCIDIR=`cat getpath.incl` SCIDIR=`cat getpath.incl`
rm -f getpath.sci getpath.incl rm -f getpath.sci getpath.incl
else else
SCIDIR="$SCI" SCIDIR="$SCI"
fi fi
#get scilab version #get scilab version
cmd='F=mopen("version.incl","w"); cmd='F=mopen("version.incl","w");
ver=getversion(); myver=getversion();
ver=part(ver, 8); myver=part(myver, 8);
mfprintf(F,ver); mfprintf(F,myver);
mclose(F);exit;' mclose(F);exit;'
echo "$cmd" > version.sci echo "$cmd" > version.sci
scilab -nwni -f version.sci >/dev/null scilab -nwni -nb -nouserstartup -f version.sci # >/dev/null
SCIVERSION=`cat version.incl` SCIVERSION=`cat version.incl`
rm -f version.sci version.incl rm -f version.sci version.incl
# scilab-branch-xx (b as in branch)
# TODO detect scilab yasp branch
if test $SCIVERSION = b; then
SCIVERSION=5
fi
echo "Scilab version is $SCIVERSION" echo "Scilab version is $SCIVERSION"
HELPDIR="" HELPDIR=""
if test $SCIVERSION -le 4; then if test $SCIVERSION -le 4; then
# checks for xsltproc (to buld HTML help pages) # checks for xsltproc (to buld HTML help pages)
AC_CHECK_PROG([has_xsltproc],[xsltproc],[yes],[no], , ) AC_CHECK_PROG([has_xsltproc],[xsltproc],[yes],[no], , )
if test x$has_xsltproc = xno; then if test x$has_xsltproc = xno; then
# checks for sabcmd as an alternative # checks for sabcmd as an alternative
AC_CHECK_PROG([has_sablotron],[sabcmd],[yes],[no], , ) AC_CHECK_PROG([has_sablotron],[sabcmd],[yes],[no], , )
if test x$has_sablotron = xno; then if test x$has_sablotron = xno; then
skipping to change at line 207 skipping to change at line 212
AC_SUBST(TOOLBOXDIR) AC_SUBST(TOOLBOXDIR)
AC_SUBST(SCIDIR) AC_SUBST(SCIDIR)
AC_SUBST(SCILIBDIR) AC_SUBST(SCILIBDIR)
AC_SUBST(SCIEXE) AC_SUBST(SCIEXE)
AC_SUBST(HELPDIR) AC_SUBST(HELPDIR)
# #
# Set defines required to build DLLs and modules using MinGW # Set defines required to build DLLs and modules using MinGW
# thx to Bob F. # thx to Bob F.
# #
# These options are set for DLL build
# libanimal: _DLL ANIMAL_LIB
# TODO:
# - update from SIMPLE toolbox
#
LIBRARY_EXTRA_CPPFLAGS='' LIBRARY_EXTRA_CPPFLAGS=''
LIBRARY_EXTRA_LIBS='' LIBRARY_EXTRA_LIBS=''
if test "${native_win32_build}" = 'yes' if test "${native_win32_build}" = 'yes'
then then
if test "${libtool_build_shared_libs}" = 'yes' if test "${libtool_build_shared_libs}" = 'yes'
then then
SHARED_LIB_SUFFIX=dll SHARED_LIB_SUFFIX=dll
CPPFLAGS="$CPPFLAGS -DFORDLL -D_DLL" CPPFLAGS="$CPPFLAGS -DFORDLL -D_DLL"
AC_MSG_WARN([[Don't forget to rename SCI/bin/LibScilab* to lowercase]]) AC_MSG_WARN([[Dont forget to rename SCI/bin/LibScilab* to lowercase]])
LDFLAGS="$LDFLAGS -L${SCIDIR}/bin" LDFLAGS="$LDFLAGS -L${SCIDIR}/bin"
LIBS="-lscilab" LIBRARY_EXTRA_CPPFLAGS="-D_SIPLIB"
LIBRARY_EXTRA_LIBS="-lscilab"
else else
CPPFLAGS="$CPPFLAGS -D_LIB" CPPFLAGS="$CPPFLAGS -D_LIB"
fi fi
else else
SHARED_LIB_SUFFIX=so case "$host_os" in
*Darwin* | *darwin*)
SHARED_LIB_SUFFIX=dylib
;;
*)
SHARED_LIB_SUFFIX=so
;;
esac
fi fi
AC_SUBST(SHARED_LIB_SUFFIX) AC_SUBST(SHARED_LIB_SUFFIX)
AC_SUBST(LIBRARY_EXTRA_CPPFLAGS) AC_SUBST(LIBRARY_EXTRA_CPPFLAGS)
AC_SUBST(LIBRARY_EXTRA_LIBS) AC_SUBST(LIBRARY_EXTRA_LIBS)
# #
# Checks for libraries. # Checks for libraries.
# #
#AC_CHECK_PROG([has_pkgconfig],[pkg-config],[yes],[no], , ) #AC_CHECK_PROG([has_pkgconfig],[pkg-config],[yes],[no], , )
#if test x$has_pkgconfig = xyes; then #if test x$has_pkgconfig = xyes; then
# pkg-config method # pkg-config method
# AC_PATH_LIB([animal],[0.3.0 -nocheck], [],[],[ # AC_PATH_LIB([animal],[0.3.0 -nocheck], [],[],[
# #if found: # #if found:
# CFLAGS="$CFLAGS -W -Wall $ANIMAL_CFLAGS" # CFLAGS="$CFLAGS -W -Wall $ANIMAL_CFLAGS"
# LIBS="$LIBS `Magick-config --libs` $ANIMAL_LIBS" # LIBS="$LIBS `Magick-config --libs` $ANIMAL_LIBS"
# ], [AC_MSG_ERROR([[AnImaL version >= 0.3.0 was not found.]])]) # ], [AC_MSG_ERROR([[AnImaL version >= 0.3.0 was not found.]])])
#else #else
# animal-config method # animal-config method
AC_PATH_LIB_LIBCONFIG AC_PATH_LIB_LIBCONFIG
AC_PATH_LIB([animal], [0.14.0 -nocheck], [animal-config], ,[ AC_PATH_LIB([animal], [0.16.0 -nocheck], [animal-config], ,[
# if found: # if found:
if test "$GCC" = "yes"; then if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -W -Wall -Wno-implicit-int" CFLAGS="$CFLAGS -W -Wall -Wno-implicit-int"
fi fi
CFLAGS="$CFLAGS $ANIMAL_CFLAGS" CFLAGS="$CFLAGS $ANIMAL_CFLAGS"
LIBS="$LIBS $ANIMAL_LIBS" LIBS="$LIBS $ANIMAL_LIBS"
], [AC_MSG_ERROR([[Either AnImaL version >= 0.13.0 was not found or a compile te st failed.]])], ], [AC_MSG_ERROR([[Either AnImaL version >= 0.13.0 was not found or a compile te st failed.]])],
[--cppflags], [--ldflags --libs]) [--cppflags], [--ldflags --libs])
################################## ##################################
skipping to change at line 298 skipping to change at line 306
AC_CHECK_PROG([has_magickwand_config],[MagickWand-config],[yes],[no], , ) AC_CHECK_PROG([has_magickwand_config],[MagickWand-config],[yes],[no], , )
MAGICK_CONFIG="Magick-config" MAGICK_CONFIG="Magick-config"
if test x$has_magickwand_config = xyes; then if test x$has_magickwand_config = xyes; then
# This is necessary because MogrifyImage is in MagickWand # This is necessary because MogrifyImage is in MagickWand
# TODO: this can be reconciled with a test for version 6.3.8-5 (when unix # TODO: this can be reconciled with a test for version 6.3.8-5 (when unix
# refactoring occurred) # refactoring occurred)
MAGICK_CONFIG="MagickWand-config" MAGICK_CONFIG="MagickWand-config"
fi fi
have_magick='no'
AC_PATH_LIB([ImageMagick], [[5.4.2 -nocheck]], [$MAGICK_CONFIG], ,[ AC_PATH_LIB([ImageMagick], [[5.4.2 -nocheck]], [$MAGICK_CONFIG], ,[
# if found: # if found:
if test x$IMAGEMAGICK_VERSION = "x5.5.5"; then if test x$IMAGEMAGICK_VERSION = "x5.5.5"; then
AC_MSG_ERROR([[ImageMagick 5.5.5 has a bug which make it unusable with AC_MSG_ERROR([[ImageMagick 5.5.5 has a bug which make it unusable with
AnImaL. Please download and install any other version from www.imagemagick.org]] ) AnImaL. Please download and install any other version from www.imagemagick.org]] )
fi fi
if test x$IMAGEMAGICK_VERSION = "x6.0.1" -o x$IMAGEMAGICK_VERSION = "x6.0.0" ; then if test x$IMAGEMAGICK_VERSION = "x6.0.1" -o x$IMAGEMAGICK_VERSION = "x6.0.0" ; then
AC_MSG_WARN([[ AC_MSG_WARN([[
**************** ****************
ImageMagick 6.0.0 and 6.0.1-3 have a bug which can \ ImageMagick 6.0.0 and 6.0.1-3 have a bug which can \
skipping to change at line 321 skipping to change at line 330
****************]]) ****************]])
fi fi
AC_SUBST(IMAGEMAGICK_LIBS) AC_SUBST(IMAGEMAGICK_LIBS)
AC_SUBST(IMAGEMAGICK_LDFLAGS) AC_SUBST(IMAGEMAGICK_LDFLAGS)
AC_SUBST(IMAGEMAGICK_CPPFLAGS) AC_SUBST(IMAGEMAGICK_CPPFLAGS)
LIBS="$IMAGEMAGICK_LIBS $LIBS" LIBS="$IMAGEMAGICK_LIBS $LIBS"
LDFLAGS="$IMAGEMAGICK_LDFLAGS $LDFLAGS" LDFLAGS="$IMAGEMAGICK_LDFLAGS $LDFLAGS"
CPPFLAGS="$IMAGEMAGICK_CPPFLAGS $CPPFLAGS" CPPFLAGS="$IMAGEMAGICK_CPPFLAGS $CPPFLAGS"
], [AC_MSG_ERROR([[ImageMagick version >= 5.4.2 was not found.]])], have_magick=yes
], [
AC_MSG_RESULT([[First try to configure ImageMagick version >= 5.4.2 could no
t be done by Magick-config,
trying pkg-config]])
have_magick=no
],
[--cppflags --cflags], [--ldflags --libs]) [--cppflags --cflags], [--ldflags --libs])
fi fi
if test "$have_magick" = 'no'; then
# Try finding imagemagick by pkg-config
PKG_CHECK_MODULES(MAGICK,
[MagickCore >= 5.4.2],
[CFLAGS="$CFLAGS $MAGICK_CFLAGS"
LDFLAGS="$LDFLAGS $MAGICK_LDFLAGS"
CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
LIBS="$LIBS $MAGICK_LIBS"],
[AC_MSG_ERROR([[ ImageMagick core >= 5.4.2 not found ]])])
PKG_CHECK_MODULES(MAGICKWAND,
[MagickWand >= 5.4.2],
[CFLAGS="$CFLAGS $MAGICKWAND_CFLAGS"
LDFLAGS="$LDFLAGS $MAGICKWAND_LDFLAGS"
CPPFLAGS="$CPPFLAGS $MAGICKWAND_CPPFLAGS"
LIBS="$LIBS $MAGICKWAND_LIBS"
have_magick=yes
# On older versions of pkg-config, the PKG_* macro will not call AC_SUBST
on
# these variables; modern versions (at least version 0.24) will take care
# of that already. Running it twice, though, will not cause problems...
MAGICK_LIBS="$MAGICK_LIBS $MAGICKWAND_LIBS"
MAGICK_LDFLAGS="$MAGICK_LDFLAGS $MAGICKWAND_LDFLAGS"
MAGICK_CPPFLAGS="$MAGICK_CPPFLAGS $MAGICKWAND_CPPFLAGS"
AC_SUBST([MAGICK_LIBS])
AC_SUBST([MAGICK_LDFLAGS])
AC_SUBST([MAGICK_CPPFLAGS])
have_magick=yes
AC_DEFINE(HAVE_MAGICK,[], [define HAVE_MAGICK if you have ImageMagick])],
[AC_MSG_ERROR([[ ImageMagick >= 5.4.2 not found ]])])
fi
# END of ImageMagick tests
dnl ===========================================================================
AC_MSG_CHECKING([if ImageMagick links]) AC_MSG_CHECKING([if ImageMagick links])
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <stdio.h> AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <stdio.h>
#include <time.h> #include <time.h>
#include <sys/types.h> #include <sys/types.h>
#include <magick/api.h>]], #include <magick/api.h>]],
[[if (1)]]), [[if (1)]]),
AC_MSG_RESULT([yes]), AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_ERROR([could not link to ImageMagick. Check the file AC_MSG_ERROR([could not link to ImageMagick. Check the file
config.log and/or send it to the SIP developers.])) config.log and/or send it to the SIP developers.]))
skipping to change at line 482 skipping to change at line 530
[The name of the default compression quality in this \ [The name of the default compression quality in this \
particular ImageMagick setup]), particular ImageMagick setup]),
AC_MSG_ERROR([No compression quality name detected. Please report your Im ageMagick version in the bugtracker at http://siptoolbox.sf.net AC_MSG_ERROR([No compression quality name detected. Please report your Im ageMagick version in the bugtracker at http://siptoolbox.sf.net
]) ])
) )
) )
) )
# END OF IMAGEMAGICK TESTS # END OF IMAGEMAGICK TESTS
############################################## dnl #############################################
# OpenCV tests (just for the future.) dnl ###############
#have_opencv=no # OpenCV tests
#PKG_CHECK_MODULES(OPENCV, dnl ###############
# [opencv >= 0.9.6], have_opencv=no
# [CFLAGS="$CFLAGS $OPENCV_CFLAGS"
# LDFLAGS="$LDFLAGS $OPENCV_LIBS" AC_ARG_WITH([opencv],
# have_opencv=yes [AS_HELP_STRING([--without-opencv], [disable the OpenCV API])],
# AC_DEFINE(HAVE_OPENCV,[], [define HAVE_OPENCV if you have opencv])], [],
# [AC_MSG_WARN([[ OpenCV version >= 0.9.6 was not found. ]])]) [with_opencv=yes])
AS_IF([test "x$with_opencv" = "xyes"], [
PKG_CHECK_MODULES(OPENCV,
[opencv >= 0.26],
[CFLAGS="$CFLAGS $OPENCV_CFLAGS"
LDFLAGS="$LDFLAGS $OPENCV_LIBS"
have_opencv=yes
AC_DEFINE(HAVE_OPENCV,[], [define HAVE_OPENCV if you have opencv])],
[AC_MSG_WARN([[ OpenCV >= 0.26 not found ]])])
])
# END of OpenCV tests
dnl #############################################
dnl #####################
# L E P T O N I C A
dnl #####################
have_lept=no
AC_ARG_WITH([leptonica],
[AS_HELP_STRING([--without-leptonica], [disable the Leptonica API])],
[],
[with_leptonica=yes])
AS_IF([test "x$with_leptonica" = "xyes"], [
# Check location of leptonica/liblept headers.
AC_MSG_CHECKING(for leptonica)
AC_ARG_VAR(LIBLEPT_HEADERSDIR,[Leptonica headers directory])
if test "$LIBLEPT_HEADERSDIR" = "" ; then
LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"
fi
for incd in $LIBLEPT_HEADERSDIR
do
for lept in . leptonica liblept
do
if test -r "$incd/$lept/allheaders.h" ; then
CPPFLAGS="$CPPFLAGS -I$incd/$lept"
have_lept=yes
fi
done
done
if test "$have_lept" = yes ; then
AC_MSG_RESULT(yes)
AC_CHECK_LIB(lept,pixCreate,[], AC_MSG_ERROR([leptonica library missing]))
else
AC_MSG_WARN([leptonica not found])
fi
])
dnl END AS_IF
# End of Leptonica Tests
##############################################
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
if test x"$ac_cv_header_stdc" = x'no'; then if test x"$ac_cv_header_stdc" = x'no'; then
AC_MSG_WARN([[this package uses ANSI-C headers but none were found.]]) AC_MSG_WARN([[this package uses ANSI-C headers but none were found.]])
fi fi
AC_CHECK_HEADERS([string.h]) AC_CHECK_HEADERS([string.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
skipping to change at line 528 skipping to change at line 631
config/loader.sce config/loader.sce
config/sip_xmltohtml.sci config/sip_xmltohtml.sci
config/loader_include.sce config/loader_include.sce
tests/Makefile]) tests/Makefile])
AC_OUTPUT AC_OUTPUT
AC_MSG_RESULT([ AC_MSG_RESULT([
===================================================== =====================================================
Configuration: Configuration:
CC = $CC CFLAGS = $CFLAGS
CFLAGS = $CFLAGS
CPPFLAGS = $CPPFLAGS CPPFLAGS = $CPPFLAGS
LDFLAGS = $LDFLAGS
LIBS = $LIBS LDFLAGS = $LDFLAGS
LIBS = $LIBS
OpenCV support = $have_opencv
Leptonica support = $have_lept
===================================================== =====================================================
This toolbox will be installed in $TOOLBOXDIR This toolbox will be installed in $TOOLBOXDIR
Please run 'make' and 'make install' to compile and install the toolbox. Please run 'make' and 'make install' to compile and install the toolbox.
]) ])
 End of changes. 18 change blocks. 
33 lines changed or deleted 144 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS