diff -Naur lcms-1.12_orig/configure lcms-1.12/configure --- lcms-1.12_orig/configure 2003-11-26 11:35:33.000000000 +0100 +++ lcms-1.12/configure 2003-12-03 11:03:02.000000000 +0100 @@ -461,7 +461,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBRARY_CURRENT LIBRARY_REVISION LIBRARY_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LD LN_S CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SWIG SUPPORT_PYTHON_TRUE SUPPORT_PYTHON_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INT8_T UINT8_T INT16_T UINT16_T INT32_T UINT32_T INT64_T UINT64_T LIB_MATH HasJPEG_TRUE HasJPEG_FALSE LIB_JPEG HasZLIB_TRUE HasZLIB_FALSE LIB_ZLIB HasTIFF_TRUE HasTIFF_FALSE LIB_TIFF LCMS_LIB_DEPLIBS JPEGICC_DEPLIBS TIFFICC_DEPLIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBRARY_CURRENT LIBRARY_REVISION LIBRARY_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LD LN_S CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SWIG SUPPORT_PYTHON_TRUE SUPPORT_PYTHON_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INT8_T UINT8_T INT16_T UINT16_T INT32_T UINT32_T INT64_T UINT64_T OPTIMIZATION_TRUE OPTIMIZATION_FALSE LIB_MATH HasJPEG_TRUE HasJPEG_FALSE LIB_JPEG HasZLIB_TRUE HasZLIB_FALSE LIB_ZLIB HasTIFF_TRUE HasTIFF_FALSE LIB_TIFF LCMS_LIB_DEPLIBS JPEGICC_DEPLIBS TIFFICC_DEPLIBS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1024,6 +1024,14 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + +### optimization / precission settings ### + --enable-assembler enable assembler optimization - default + --disable-assembler disable assembler optimization - for + non Pentium plattforms + --enable-float enable calculation in float precission + automatically disables optimization + --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors --enable-shared[=PKGS] @@ -1509,7 +1517,6 @@ # Reject versions of SWIG lower than this version SWIG_MINIMUM_VERSION="1.3.12" - # Obtain system type by running config.guess ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -1666,7 +1673,6 @@ echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - am__api_version="1.7" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2028,6 +2034,28 @@ with_python='no' fi; +# Optimization +# Check whether --enable-assembler or --disable-assembler was given. +if test "${enable_assembler+set}" = set; then + enableval="$enable_assembler" + with_assembler=$enableval +else + with_assembler='yes' +fi; + +#AC_ARG_WITH(assembler, +# [ --with-assembler enable assembler optimization - default +# --without-assembler disable assembler optimization - for +# non Pentium plattforms], +# [with_assembler='no'], [with_assembler='no']) +# Check whether --enable-float or --disable-float was given. +if test "${enable_float+set}" = set; then + enableval="$enable_float" + with_float=$enableval +else + with_float='no' +fi; + # Check for programs ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4674,7 +4702,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4677 "configure"' > conftest.$ac_ext + echo '#line 4705 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5757,7 +5785,7 @@ # Provide some information about the compiler. -echo "$as_me:5760:" \ +echo "$as_me:5788:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6762,11 +6790,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6765: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6793: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6769: \$? = $ac_status" >&5 + echo "$as_me:6797: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6994,11 +7022,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6997: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7025: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7001: \$? = $ac_status" >&5 + echo "$as_me:7029: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7061,11 +7089,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7064: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7092: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7068: \$? = $ac_status" >&5 + echo "$as_me:7096: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9073,7 +9101,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11334: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11310: \$? = $ac_status" >&5 + echo "$as_me:11338: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11370,11 +11398,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11373: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11401: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11377: \$? = $ac_status" >&5 + echo "$as_me:11405: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12613,7 +12641,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13564: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13540: \$? = $ac_status" >&5 + echo "$as_me:13568: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13600,11 +13628,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13603: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13631: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13607: \$? = $ac_status" >&5 + echo "$as_me:13635: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15540,11 +15568,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15571: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15547: \$? = $ac_status" >&5 + echo "$as_me:15575: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15772,11 +15800,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15775: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15803: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15779: \$? = $ac_status" >&5 + echo "$as_me:15807: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15839,11 +15867,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15842: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15870: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15846: \$? = $ac_status" >&5 + echo "$as_me:15874: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17851,7 +17879,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo $ECHO_N "checking for Optimization... $ECHO_C" >&6 + OPTIMIZATION="USE_FLOAT" + +cat >>confdefs.h <<\_ACEOF +#define USE_FLOAT 1 +_ACEOF + + echo "$as_me:$LINENO: result: float calculation enabled" >&5 +echo "${ECHO_T}float calculation enabled" >&6 +else + if test "$with_assembler" = 'yes' + then + echo "$as_me:$LINENO: checking for Optimization" >&5 +echo $ECHO_N "checking for Optimization... $ECHO_C" >&6 + OPTIMIZATION="USE_ASSEMBLER" + +cat >>confdefs.h <<\_ACEOF +#define USE_ASSEMBLER 1 +_ACEOF + + echo "$as_me:$LINENO: result: integer calculation with ASSEMBLER optimization" >&5 +echo "${ECHO_T}integer calculation with ASSEMBLER optimization" >&6 + else + if test "$with_assembler" = 'no' + then + echo "$as_me:$LINENO: checking for Optimization" >&5 +echo $ECHO_N "checking for Optimization... $ECHO_C" >&6 + OPTIMIZATION="USE_C" + +cat >>confdefs.h <<\_ACEOF +#define USE_C 1 +_ACEOF + + echo "$as_me:$LINENO: result: integer calculation" >&5 +echo "${ECHO_T}integer calculation" >&6 + fi + fi +fi + + + +if test ! OPTIMIZATION = ''; then + OPTIMIZATION_TRUE= + OPTIMIZATION_FALSE='#' +else + OPTIMIZATION_TRUE='#' + OPTIMIZATION_FALSE= +fi + + +# # Find math library # LIB_MATH='' @@ -23608,6 +23698,7 @@ + # Libraries that the LCMS library depends on LCMS_LIB_DEPLIBS="$LIB_MATH" LCMS_LIB_DEPLIBS=`echo $LCMS_LIB_DEPLIBS | sed -e 's/ */ /g'` @@ -23787,6 +23878,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${OPTIMIZATION_TRUE}" && test -z "${OPTIMIZATION_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"OPTIMIZATION\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"OPTIMIZATION\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HasJPEG_TRUE}" && test -z "${HasJPEG_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HasJPEG\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -24440,6 +24538,8 @@ s,@UINT32_T@,$UINT32_T,;t t s,@INT64_T@,$INT64_T,;t t s,@UINT64_T@,$UINT64_T,;t t +s,@OPTIMIZATION_TRUE@,$OPTIMIZATION_TRUE,;t t +s,@OPTIMIZATION_FALSE@,$OPTIMIZATION_FALSE,;t t s,@LIB_MATH@,$LIB_MATH,;t t s,@HasJPEG_TRUE@,$HasJPEG_TRUE,;t t s,@HasJPEG_FALSE@,$HasJPEG_FALSE,;t t diff -Naur lcms-1.12_orig/configure.ac lcms-1.12/configure.ac --- lcms-1.12_orig/configure.ac 2003-11-26 11:35:00.000000000 +0100 +++ lcms-1.12/configure.ac 2003-12-03 11:10:04.000000000 +0100 @@ -2,6 +2,7 @@ # LCMS configure script # Written by Bob Friesenhahn, June 2003 # The bugs were introduced by Marti Maria on July 2003 +# Optimization switches added - Kai-Uwe Behrmann 2003/12/02 # AC_PREREQ(2.57) @@ -43,14 +44,12 @@ # Reject versions of SWIG lower than this version SWIG_MINIMUM_VERSION="1.3.12" - # Obtain system type by running config.guess AC_CANONICAL_SYSTEM # Ensure that make can run correctly AM_SANITY_CHECK - AM_INIT_AUTOMAKE([foreign 1.7.2 no-define dist-zip dist-bzip2]) # Disable JPEG. @@ -77,6 +76,20 @@ [with_python=$withval], [with_python='no']) +# Optimization +AC_ARG_ENABLE(assembler, + [ +### optimization / precission settings ### + --enable-assembler enable assembler optimization - default + --disable-assembler disable assembler optimization - for + non Pentium plattforms], + [with_assembler=$enableval], [with_assembler='yes']) +AC_ARG_ENABLE(float, + [ --enable-float enable calculation in float precission + automatically disables optimization +], + [with_float=$enableval], [with_float='no']) + # Check for programs AC_PROG_CC AC_PROG_CC_STDC @@ -278,6 +291,41 @@ # +# Decide which Optimization +# +OPTIMIZATION="USE_ASSEMBLER" +#if test ! with_assembler = 'no' && test ! with_assembler = 'yes' +#then +# with_assembler = 'yes' +#fi + +if test "$with_float" = 'yes' +then + AC_MSG_CHECKING(for Optimization) + OPTIMIZATION="USE_FLOAT" + AC_DEFINE(USE_FLOAT,1,Define if you have FLOAT calculation enabled) + AC_MSG_RESULT(float calculation enabled) +else + if test "$with_assembler" = 'yes' + then + AC_MSG_CHECKING(for Optimization) + OPTIMIZATION="USE_ASSEMBLER" + AC_DEFINE(USE_ASSEMBLER,1,Define if you have ASSEMBLER optimization enabled) + AC_MSG_RESULT(integer calculation with ASSEMBLER optimization) + else + if test "$with_assembler" = 'no' + then + AC_MSG_CHECKING(for Optimization) + OPTIMIZATION="USE_C" + AC_DEFINE(USE_C,1,Define if you have optimization disabled) + AC_MSG_RESULT(integer calculation, optimization disabled) + fi + fi +fi + +AM_CONDITIONAL(OPTIMIZATION, test ! OPTIMIZATION = '') + +# # Find math library # LIB_MATH='' diff -Naur lcms-1.12_orig/include/lcms.h lcms-1.12/include/lcms.h --- lcms-1.12_orig/include/lcms.h 2003-11-26 10:34:08.000000000 +0100 +++ lcms-1.12/include/lcms.h 2003-12-03 11:18:20.000000000 +0100 @@ -34,7 +34,7 @@ // #define USE_FLOAT 1 // #define USE_C 1 -#define USE_ASSEMBLER 1 +// #define USE_ASSEMBLER 1 // 3D interpolation method - Tetrahedral is the default option