diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 99 |
1 files changed, 56 insertions, 43 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lcms2 2.11. +# Generated by GNU Autoconf 2.69 for lcms2 2.12. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='lcms2' PACKAGE_TARNAME='lcms2' -PACKAGE_VERSION='2.11' -PACKAGE_STRING='lcms2 2.11' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='lcms2 2.12' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -634,6 +634,7 @@ LTLIBOBJS LIBOBJS TIFFICC_DEPLIBS JPEGICC_DEPLIBS +LIB_PLUGINS LCMS_LIB_DEPLIBS LIB_TIFF HasTIFF_FALSE @@ -759,7 +760,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -796,6 +796,7 @@ enable_maintainer_mode with_jpeg with_tiff with_zlib +with_fastfloat with_threads ' ac_precious_vars='build_alias @@ -849,7 +850,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1102,15 +1102,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1248,7 +1239,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1361,7 +1352,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lcms2 2.11 to adapt to many kinds of systems. +\`configure' configures lcms2 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1392,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1432,7 +1422,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lcms2 2.11:";; + short | recursive ) echo "Configuration of lcms2 2.12:";; esac cat <<\_ACEOF @@ -1466,6 +1456,8 @@ Optional Packages: --with-jpeg=DIR use jpeg installed in DIR --with-tiff=DIR use tiff installed in DIR --without-zlib disable ZLIB support + --with-fastfloat build and install fast_float plugin, use only if GPL + 3.0 is acceptable --without-threads disable POSIX threads API support Some influential environment variables: @@ -1547,7 +1539,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lcms2 configure 2.11 +lcms2 configure 2.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2033,7 +2025,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lcms2 $as_me 2.11, which was +It was created by lcms2 $as_me 2.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2387,27 +2379,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # # Libtool library revision control info -# See the libtool documentation under the heading "Libtool's versioning -# system" in order to understand the meaning of these fields -# -# Here are a set of rules to help you update your library version -# information: -# -# 1. Start with version information of `0:0:0' for each libtool library. -# 2. Update the version information only immediately before a public -# release of your software. More frequent updates are unnecessary, and -# only guarantee that the current interface number gets larger faster. -# 3. If the library source code has changed at all since the last update, -# then increment revision (`c:r:a' becomes `c:r+1:a'). -# 4. If any interfaces have been added, removed, or changed since the last -# update, increment current, and set revision to 0. -# 5. If any interfaces have been added since the last public release, then -# increment age. -# 6. If any interfaces have been removed since the last public release, -# then set age to 0. # LIBRARY_CURRENT=2 -LIBRARY_REVISION=10 +LIBRARY_REVISION=12 LIBRARY_AGE=0 @@ -2999,7 +2973,7 @@ fi # Define the identity of the package. PACKAGE='lcms2' - VERSION='2.11' + VERSION='2.12' # Some tools Automake needs. @@ -15942,6 +15916,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +LIB_PLUGINS = '' + # Add configure option --enable-maintainer-mode which enables dependency # checking and generation useful to package maintainers. This is made an # option to avoid confusing end users. @@ -16430,6 +16406,21 @@ else fi +#fast_float plugin: + +# Check whether --with-fastfloat was given. +if test "${with_fastfloat+set}" = set; then : + withval=$with_fastfloat; + with_fastfloat='yes' + LIB_PLUGINS="$LIB_PLUGINS -llcms2_fast_float" + +else + + with_fastfloat='no' + +fi + + # # Determine POSIX threads settings # @@ -17715,6 +17706,9 @@ LCMS_LIB_DEPLIBS="$LIB_MATH $LIB_THREAD" LCMS_LIB_DEPLIBS=`echo $LCMS_LIB_DEPLIBS | sed -e 's/ */ /g'` +echo "LIB_PLUGINS: $LIB_PLUGINS" + + # Libraries that the jpegicc program depends on JPEGICC_DEPLIBS="$LIB_JPEG $LIB_MATH $LIB_THREAD" JPEGICC_DEPLIBS=`echo $JPEGICC_DEPLIBS | sed -e 's/ */ /g'` @@ -17750,6 +17744,18 @@ ac_config_files="$ac_config_files utils/psicc/Makefile" ac_config_files="$ac_config_files testbed/Makefile" +if test "x$with_fastfloat" = "xyes" ; then + ac_config_files="$ac_config_files plugins/Makefile" + + ac_config_files="$ac_config_files plugins/fast_float/Makefile" + + ac_config_files="$ac_config_files plugins/fast_float/src/Makefile" + + ac_config_files="$ac_config_files plugins/fast_float/include/Makefile" + + ac_config_files="$ac_config_files plugins/fast_float/testbed/Makefile" + +fi cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -18337,7 +18343,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lcms2 $as_me 2.11, which was +This file was extended by lcms2 $as_me 2.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18394,7 +18400,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lcms2 config.status 2.11 +lcms2 config.status 2.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18901,6 +18907,11 @@ do "utils/jpgicc/Makefile") CONFIG_FILES="$CONFIG_FILES utils/jpgicc/Makefile" ;; "utils/psicc/Makefile") CONFIG_FILES="$CONFIG_FILES utils/psicc/Makefile" ;; "testbed/Makefile") CONFIG_FILES="$CONFIG_FILES testbed/Makefile" ;; + "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; + "plugins/fast_float/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/Makefile" ;; + "plugins/fast_float/src/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/src/Makefile" ;; + "plugins/fast_float/include/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/include/Makefile" ;; + "plugins/fast_float/testbed/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fast_float/testbed/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -19412,7 +19423,9 @@ $as_echo X/"$am_mf" | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } |