[Digikam-devel] extragear/graphics/digikam

[Achim Bohnet]

On Thursday 01 December 2005 23:28, Jörn Ahrens wrote:
> SVN commit 484784 by jahrens:
> 
> Searching for the correct lcms.h path to include

lcms has a lcms.pc, so why not use pgk-config macro,
like for libkexif/libkipi?

Achim -- which is no fan of dozend of -I/usr/include repetitions ;)
> 
>  M  +58 -0     configure.in.in  
>  M  +2 -1      libs/dimg/icctransform.cpp  
>  M  +3 -1      utilities/setup/setupicc.cpp  
> 
> 
> --- trunk/extragear/graphics/digikam/configure.in.in #484783:484784
> @@ -77,6 +77,64 @@
>  
>  AC_SUBST(LIB_SQLITE3)
>  
> +# -----------------------------------------------------------------
> +# lcms check
> +# -----------------------------------------------------------------
> +
> +have_lcms_header='no'
> +KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
> +if test "$have_lcms_header" = 'yes'
> +then
> +    LCMS_LIBS='-llcms'
> +    AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header])
> +else
> +    # Alternative! Debian does it this way...
> +    KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
> +    if test "$have_lcms_header" = 'yes'
> +    then
> +        LCMS_LIBS='-llcms'
> +        AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header])
> +
> +        # Try to find the full path of lcms.h
> +        for a in $includedir $prefix/include /usr/include /usr/local/include $kde_extra_includes; do
> +            for b in lcms.h lcms/lcms.h ; do
> +                if test -d "$a"  && test -f "$a/$b" ; then
> +                    LCMSHDR="$a/$b"
> +                fi
> +            done
> +        done
> +        # Check if lcms.h was found. If not then it means that we didn't search
> +        # the right dirs since the kde check already found a usable lcms.h
> +        if test -n "$LCMSHDR" ; then
> +            # Get lcms version
> +            lcms_ver_line=`cat $LCMSHDR | grep '^// Version' `
> +            if test -z "$lcms_ver_line" ; then
> +                # Some versions of lcms have the version in /* */
> +                lcms_ver_line=`cat $LCMSHDR | grep '^/\* Version' `
> +            fi
> +            lcms_ver=`echo "$lcms_ver_line" | head -n 1 | cut -d ' ' -f 3 `
> + 
> +            # Get major and minor version numbers
> +            lcms_var_maj=`echo $lcms_ver | cut -d . -f 1`
> + 
> +            # Some versions have a character attached to the end of minor version
> +            lcms_var_min=`echo $lcms_ver | cut -d . -f 2 | sed 's,[^0-9],,g'`
> + 
> +            if test "$lcms_var_maj" -gt 1 || test "$lcms_var_min" -lt 9 ; then
> +                LCMS_LIBS=''
> +        fi
> +    fi
> +    else
> +        LCMS_LIBS=''
> +    fi
> +fi
> +
> +if test -z "$LCMS_LIBS"; then
> +    DO_NOT_COMPILE="$DO_NOT_COMPILE digikam digikamimageplugins"
> +fi
> +
> +AC_SUBST(LCMS_LIBS)
> +
>  # -------------------------------------------------------
>  # Check endianness
>  # -------------------------------------------------------
> --- trunk/extragear/graphics/digikam/libs/dimg/icctransform.cpp #484783:484784
> @@ -17,7 +17,8 @@
>  
>  // Littlecms library includes.
>  
> -#include <lcms.h>
> +#include <config.h>
> +#include LCMS_HEADER
>  
>  // QT includes
>  
> --- trunk/extragear/graphics/digikam/utilities/setup/setupicc.cpp #484783:484784
> @@ -19,6 +19,8 @@
>   * 
>   * ============================================================ */
>  
> +#include <config.h>
> +
>  // QT includes.
>  
>  #include <qlayout.h>
> @@ -55,7 +57,7 @@
>  
>  // Others
>  
> -#include <lcms.h>
> +#include LCMS_HEADER
>  
>  //--Signatures for device class-------------
>  /*
> 

-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
                                      -- reddy at lion.austin.ibm.com