X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=configure.ac;h=8699babf2f047031f71bf6256bdfe2684fac7927;hb=24d5d722cf4ba0767eb0d790e1b228a518d737cf;hp=06bf1d4e9f12638fe3d0ec6ec013862122ed151c;hpb=7def36a47825fccaaa74225102d8b53285cd2ebf;p=imagemagick diff --git a/configure.ac b/configure.ac index 06bf1d4e9..8699babf2 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization +# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization # dedicated to making software imaging solutions freely available. # # You may not use this file except in compliance with the License. You may @@ -125,7 +125,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK -AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-zip dist-bzip2 dist-xz]) +AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -189,7 +189,7 @@ eval "eval LIBEXEC_DIR=$libexecdir" AC_SUBST(LIBEXEC_DIR) eval "eval DATA_DIR=$datadir" AC_SUBST(DATA_DIR) -eval "eval DOC_DIR=$docdir" +eval "eval DOC_DIR=$datadir/doc" AC_SUBST(DOC_DIR) eval "eval SYSCONF_DIR=$sysconfdir" AC_SUBST(SYSCONF_DIR) @@ -261,13 +261,14 @@ AC_PROG_MAKE_SET AC_PROG_LN_S AM_WITH_DMALLOC AX_C___ATTRIBUTE__ +AX_GCC_ARCHFLAG([no]) PKG_PROG_PKG_CONFIG # # Enable run-time checking. # AC_ARG_ENABLE([bounds-checking], - [AC_HELP_STRING([--bounds-checking], + [AC_HELP_STRING([--enable-bounds-checking], [enable run-time bounds-checking])], [enable_bounds_checking=$enableval], [enable_bounds_checking='no']) @@ -379,27 +380,27 @@ esac # # ARCH specific include directory # -AC_ARG_WITH([includedir-arch], - [AC_HELP_STRING([--includedir-arch=DIR], +AC_ARG_WITH([includearch-dir], + [AC_HELP_STRING([--includearch-dir=DIR], [ARCH specific include directory])], - [includedir_arch=$withval], - [includedir_arch=$INCLUDE_DIR]) + [includearch_dir=$withval], + [includearch_dir=$INCLUDE_DIR]) -eval "eval INCLUDEDIR_ARCH=$includedir_arch" -AC_SUBST(INCLUDEDIR_ARCH) +eval "eval INCLUDEARCH_DIR=$includearch_dir" +AC_SUBST(INCLUDEARCH_DIR) # # ARCH specific configuration directory # -AC_ARG_WITH([sharedir-arch], - [AC_HELP_STRING([--sharedir-arch=DIR], +AC_ARG_WITH([sharearch-dir], + [AC_HELP_STRING([--sharearch-dir=DIR], [ARCH specific config directory])], - [sharedir_arch=$withval], - [sharedir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"]) + [sharearch_dir=$withval], + [sharearch_dir="${LIB_DIR}"]) -eval "eval SHAREDIR_ARCH=$sharedir_arch" -SHAREDIR_ARCH="$sharedir_arch" -AC_SUBST(SHAREDIR_ARCH) +eval "eval SHAREARCH_DIR=$sharearch_dir" +SHAREARCH_DIR="$sharearch_dir" +AC_SUBST(SHAREARCH_DIR) # # Enable support for threads @@ -680,13 +681,21 @@ fi AC_ARG_WITH([method-prefix], [AC_HELP_STRING([--with-method-prefix=PREFIX], [prefix MagickCore API methods])], - [with_method_prefix=$enableval], - [with_method_prefix='']) + [with_method_prefix=$withval], + [with_method_prefix='no']) -if test "$with_method_prefix" != ''; then +if test "$with_method_prefix" != 'no'; then AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX,$with_method_prefix,[Magick API method prefix]) + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix " fi +# Enable legacy support (default no) +AC_ARG_ENABLE(legacy-support, + [ --enable-legacy-support install legacy command-line utilities (default disabled)], + [with_legacy_support=$enableval], + [with_legacy_support='no']) +AM_CONDITIONAL(LEGACY_SUPPORT, test "$with_legacy_support" != 'no') + # Number of bits in a Quantum AC_ARG_WITH([quantum-depth], [AC_HELP_STRING([--with-quantum-depth=DEPTH], @@ -745,7 +754,7 @@ AC_ARG_WITH([perl], # Options to pass when configuring PerlMagick AC_ARG_WITH([perl-options], [AC_HELP_STRING([--with-perl-options=OPTIONS], - [options to pass on command-line when generating PerlMagick's build file])], + [options to pass on command-line when generating PerlMagick build file])], PERL_MAKE_OPTIONS=$withval) AC_SUBST(PERL_MAKE_OPTIONS) @@ -985,7 +994,7 @@ elif test $ac_cv_sizeof_signed_long_long -eq 8; then INT64_T='signed long long' INT64_F='"ll"' fi -case "${build_os}" in +case "${host_os}" in mingw* ) INT64_F='"I64"' ;; @@ -1004,7 +1013,7 @@ elif test $ac_cv_sizeof_unsigned_long_long -eq 8; then UINT64_T='unsigned long long' UINT64_F='"ll"' fi -case "${build_os}" in +case "${host_os}" in mingw* ) UINT64_F='"I64"' ;; @@ -1081,7 +1090,7 @@ AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,) LIBS="$MATH_LIBS $LIBS" AC_SUBST(MATH_LIBS) -AC_CHECK_FUNCS([acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) +AC_CHECK_FUNCS([acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) # # Check for clock_gettime(). @@ -1173,7 +1182,7 @@ if test "$enable_delegate_build" != 'no'; then # Most delegates have includes in the same directory as the library, but not all... # # Includes - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -1184,7 +1193,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else @@ -1268,11 +1277,29 @@ AC_DEFINE_UNQUOTED(X11_CONFIGURE_PATH,"$X11ConfigurePath",Location of X11 config GOMP_LIBS='' if test "$enable_openmp" != 'no'; then if test "${GCC}" = "yes"; then - AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,) # gcc + # Open64 (passes for GCC but uses different OpenMP implementation) + if test "x$GOMP_LIBS" = x ; then + if $CC --version 2>&1 | grep Open64 > /dev/null ; then + AC_CHECK_LIB(openmp,omp_get_num_procs,GOMP_LIBS="-lopenmp",,) + fi + fi + # GCC + if test "x$GOMP_LIBS" = x ; then + AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,) + fi else - AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,) # solaris cc - AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,) # AIX xlc - AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,) # SGI IRIX 6.5 MIPSpro C/C++ + # Sun CC + if test "x$GOMP_LIBS" = x ; then + AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,) + fi + # AIX xlc + if test "x$GOMP_LIBS" = x ; then + AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,) + fi + # SGI IRIX 6.5 MIPSpro C/C++ + if test "x$GOMP_LIBS" = x ; then + AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,) + fi fi LIBS="$GOMP_LIBS $LIBS" fi @@ -1796,7 +1823,7 @@ AC_ARG_WITH([fontconfig], [AC_HELP_STRING([--without-fontconfig], [disable fontconfig support])], [with_fontconfig=$withval], - [with_fontconfig=$have_x]) + [with_fontconfig='yes']) if test "$with_fontconfig" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontconfig=$with_fontconfig " @@ -2361,36 +2388,22 @@ if test "$with_lzma" != 'yes' ; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma " fi -# -# Check for LZMA -# -have_lzma='no' -LZMA_LIBS='' -if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then +LZMA_PKG="" +if test "x$with_lzma" = "xyes"; then AC_MSG_NOTICE([-------------------------------------------------------------]) - AC_MSG_CHECKING(for LZMA) - AC_MSG_NOTICE() - failed=0 - passed=0 - AC_CHECK_HEADER(lzma.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) - AC_CHECK_LIB(lzma,lzma_code,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_MSG_CHECKING(if LZMA package is complete) - if test $passed -gt 0; then - if test $failed -gt 0; then - AC_MSG_NOTICE(no -- some components failed test) - have_lzma='no (failed tests)' - else - LZMA_LIBS='-llzma' - LIBS="$LZMA_LIBS $LIBS" - AC_DEFINE(LZMA_DELEGATE,1,Define if you have lzma compression library) - AC_MSG_NOTICE(yes) - have_lzma='yes' + PKG_CHECK_MODULES(LZMA,[liblzma >= 2.9.0], have_lzma=yes, have_lzma=no) + AC_MSG_NOTICE([]) +fi + +if test "$have_lzma" = 'yes'; then + AC_DEFINE(LZMA_DELEGATE,1,Define if you have LZMA library) + if test "$with_modules" = 'no'; then + CPPFLAGS="$LZMA_CFLAGS $CPPFLAGS" fi - else - AC_MSG_NOTICE(no) - fi fi + AM_CONDITIONAL(LZMA_DELEGATE, test "$have_lzma" = 'yes') +AC_SUBST(LZMA_CFLAGS) AC_SUBST(LZMA_LIBS) dnl =========================================================================== @@ -2438,22 +2451,22 @@ AC_ARG_WITH([pango], [AC_HELP_STRING([--without-pango], [disable PANGO support])], [with_pango=$withval], - [with_pango=$have_x]) + [with_pango='yes']) if test "$with_pango" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango " fi have_pango='no' -have_pangoft2='no' +have_pangocairo='no' PANGO_CFLAGS="" PANGO_LIBS="" PANGO_PKG="" if test "x$with_pango" = "xyes"; then AC_MSG_RESULT([-------------------------------------------------------------]) - PKG_CHECK_MODULES(PANGO, pangoft2, have_pangoft2=yes, have_pangoft2=no) + PKG_CHECK_MODULES(PANGO, [pangocairo >= 1.28.1], have_pangocairo=yes, have_pangocairo=no) AC_MSG_RESULT([]) - PKG_CHECK_MODULES(PANGO, pango, have_pango=yes, have_pango=no) + PKG_CHECK_MODULES(PANGO, [pango >= 1.28.1], have_pango=yes, have_pango=no) AC_MSG_RESULT([]) fi @@ -2464,15 +2477,15 @@ if test "$have_pango" = 'yes'; then fi fi -if test "$have_pangoft2" = 'yes'; then - AC_DEFINE(PANGOFT2_DELEGATE,1,Define if you have PANGOFT2 library) +if test "$have_pangocairo" = 'yes'; then + AC_DEFINE(PANGOCAIRO_DELEGATE,1,Define if you have PANGOCAIRO library) if test "$with_modules" = 'no'; then - CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS" + CPPFLAGS="$PANGOCAIRO_CFLAGS $CPPFLAGS" fi fi AM_CONDITIONAL(PANGO_DELEGATE, test "$have_pango" = 'yes') -AM_CONDITIONAL(PANGOFT2_DELEGATE, test "$have_pangoft2" = 'yes') +AM_CONDITIONAL(PANGOCAIRO_DELEGATE, test "$have_pangocairo" = 'yes') AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) @@ -2602,7 +2615,7 @@ AC_ARG_WITH([rsvg], [AC_HELP_STRING([--without-rsvg], [disable RSVG support])], [with_rsvg=$withval], - [with_rsvg=$have_x]) + [with_rsvg='yes']) if test "$with_rsvg" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-rsvg=$with_rsvg " @@ -2667,7 +2680,6 @@ if test "$with_tiff" != 'no'; then AC_CHECK_HEADER(tiffio.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) AC_CHECK_LIB(tiff,TIFFOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_CHECK_LIB(tiff,TIFFClientOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_CHECK_LIB(tiff,TIFFIsBigEndian,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_CHECK_LIB(tiff,TIFFIsByteSwapped,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_CHECK_LIB(tiff,TIFFReadRGBATile,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_CHECK_LIB(tiff,TIFFReadRGBAStrip,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) @@ -2684,8 +2696,9 @@ if test "$with_tiff" != 'no'; then have_tiff='yes' AC_CHECK_HEADERS(tiffconf.h) AC_CHECK_FUNCS([TIFFIsCODECConfigured TIFFMergeFieldInfo \ - TIFFReadEXIFDirectory TIFFSetErrorHandlerExt TIFFSetTagExtender \ - TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples]) + TIFFIsBigEndian TIFFReadEXIFDirectory TIFFSetErrorHandlerExt \ + TIFFSetTagExtender TIFFSetWarningHandlerExt \ + TIFFSwabArrayOfTriples]) fi else AC_MSG_NOTICE([no]) @@ -2758,10 +2771,10 @@ dnl =========================================================================== # Check for WMF delegate library. # AC_ARG_WITH([wmf], - [AC_HELP_STRING([--without-wmf], - [disable WMF support])], + [AC_HELP_STRING([--with-wmf], + [enable WMF support])], [with_wmf=$withval], - [with_wmf='yes']) + [with_wmf='no']) if test "$with_wmf" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-wmf=$with_wmf " @@ -2769,34 +2782,56 @@ fi have_wmf='no' WMF_LIBS='' +WMF_LIBS_DEPS='' +OLIBS="$LIBS" if test "$with_wmf" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for WMF]) - AC_MSG_NOTICE([]) - failed=0 - passed=0 - AC_CHECK_HEADER(libwmf/eps.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_CHECK_LIB(wmf,wmf_eps_function,passed=`expr $passed + 1`,failed=`expr $failed + 1`,"-lwmflite") - AC_MSG_CHECKING([if WMF package is complete]) - if test $passed -gt 0; then - if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) - have_wmf='no (failed tests)' - else - WMF_LIBS='-lwmf -lwmflite' + AC_MSG_RESULT([]) + have_libwmf='no' + have_libwmflite='no' + have_libwmf_ipa_h='no' + + AC_CHECK_HEADER([libwmf/ipa.h],[have_libwmf_ipa_h='yes'],,[$FT2BUILD_H]) + if test "$have_libwmf_ipa_h" = 'yes'; then + AC_CHECK_LIB(wmflite,wmf_lite_create,have_libwmflite='yes',,) + if test "$have_libwmflite" = 'yes'; then + AC_DEFINE(WMFLITE_DELEGATE,1,Define if you have wmflite library) + WMF_LIBS='-lwmflite' LIBS="$WMF_LIBS $LIBS" - AC_DEFINE(WMF_DELEGATE,1,Define if you have WMF library) - AC_MSG_NOTICE([yes]) have_wmf='yes' + else + WMF_LIBS_DEPS='' + WMF_CONFIG_LIBS=`libwmf-config --libs` + for lib in xml2 expat freetype jpeg png z; do + testlib="-l${lib}" + echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib" + done + AC_CHECK_LIB(wmf,wmf_api_create,have_libwmf='yes',,$WMF_LIBS_DEPS) + if test "$have_libwmf" = 'yes'; then + AC_DEFINE(WMF_DELEGATE,1,Define if you have wmf library) + WMF_LIBS='-lwmf' + LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' + else + AC_MSG_RESULT([no -- some components failed test]) + have_wmf='no (failed tests)' + have_wmflite='no (failed tests)' + LIBS="$OLIBS" + WMF_LIBS='' + fi fi + fi + AC_MSG_CHECKING([if WMF package is complete]) + if test "$have_wmf" = 'yes'; then + AC_MSG_RESULT([yes]) else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi -AM_CONDITIONAL(WMF_DELEGATE,test "$have_wmf" = 'yes') +AM_CONDITIONAL(WMF_DELEGATE, test "$have_wmf" = 'yes') AC_SUBST(WMF_LIBS) - -dnl =========================================================================== +AC_SUBST(WMF_LIBS_DEPS) dnl =========================================================================== @@ -2808,7 +2843,7 @@ AC_ARG_WITH([xml], [AC_HELP_STRING([--without-xml], [disable XML support])], [with_xml=$withval], - [with_xml=$have_x]) + [with_xml='yes']) if test "$with_xml" != 'yes' ; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-xml=$with_xml " @@ -2875,8 +2910,8 @@ AC_SUBST(PERLMAINCC) # Path to ImageMagick header files INCLUDE_RELATIVE_PATH="ImageMagick" -INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}" -DEFINE_INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}/" +INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}" +DEFINE_INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1` @@ -2941,7 +2976,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="" +DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in @@ -2968,7 +3003,7 @@ AC_SUBST(CONFIGURE_PATH) # Subdirectory to place architecture-independent configuration files SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.) -SHARE_PATH="${SHAREDIR-ARCH}/${SHARE_RELATIVE_PATH}" +SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}" DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) @@ -2978,6 +3013,19 @@ esac AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.) AC_SUBST(SHARE_PATH) +# Subdirectory to place architecture-dependent configuration files +SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config" +AC_DEFINE_UNQUOTED(SHAREARCH_RELATIVE_PATH,"$SHAREARCH_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.) +SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}" +DEFINE_SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}/" +case "${build_os}" in + mingw* ) + DEFINE_SHAREARCH_PATH=`$WinPathScript "$DEFINE_SHAREARCH_PATH" 1` + ;; +esac +AC_DEFINE_UNQUOTED(SHAREARCH_PATH,"$DEFINE_SHAREARCH_PATH",Directory where architecture-independent configuration files live.) +AC_SUBST(SHAREARCH_PATH) + # # program_transform_name is formed for use in a Makefile, so create a # modified version for use in a shell script. @@ -3029,7 +3077,7 @@ else fi RLEEncodeDelegateDefault='rawtorle' RMDelegateDefault='rm' -RSVGDecodeDelegateDefault='rsvg' +RSVGDecodeDelegateDefault='rsvg-convert' SCANDecodeDelegateDefault='scanimage' TXTDelegateDefault='enscript' UniconvertorDelegateDefault='uniconvertor' @@ -3595,6 +3643,7 @@ if test "$have_lqr" = 'yes'; then DELEGATES="$DELEGATES lqr"; fi if test "$have_lzma" = 'yes'; then DELEGATES="$DELEGATES lzma"; fi if test "$have_ffmpeg" = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi if test "$have_openexr" = 'yes'; then DELEGATES="$DELEGATES openexr"; fi +if test "$have_pango" = 'yes'; then DELEGATES="$DELEGATES pango"; fi if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES png"; fi if test "$have_rsvg" = 'yes'; then DELEGATES="$DELEGATES rsvg"; fi if test "$have_tiff" = 'yes'; then DELEGATES="$DELEGATES tiff"; fi