diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-03-24 05:37:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-03-24 05:37:47 +0000 |
| commit | be5434018ad5d117ee184b95fcdf8b3ededbcc09 (patch) | |
| tree | eca6129e36d290ae0783d5f0a0eea96344df45e8 /configure.in | |
| parent | 96ffb8e1e03229bd506001490a6c2626f4cd5d48 (diff) | |
| download | koffice-be5434018ad5d117ee184b95fcdf8b3ededbcc09.tar.gz koffice-be5434018ad5d117ee184b95fcdf8b3ededbcc09.zip | |
Automake fixups
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1106897 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/configure.in b/configure.in index add03463..699ee395 100644 --- a/configure.in +++ b/configure.in @@ -1265,6 +1265,8 @@ KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,) if test "$have_lcms_header" = 'yes' then AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header]) + HAVELCMS="yes" + LCMS_LIBS="-llcms" echo "#include <lcms/lcms.h>" > conftest.$ac_ext echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext @@ -1279,6 +1281,8 @@ else if test "$have_lcms_header" = 'yes' then AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header]) + HAVELCMS="yes" + LCMS_LIBS="-llcms" echo "#include <lcms.h>" > conftest.$ac_ext echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext @@ -1290,6 +1294,8 @@ else # and now debian also does it this way... can't they decide for one way of doing stuff ? AC_DEFINE(LCMS_HEADER, <liblcms1/lcms.h>, [The correct header]) + HAVELCMS="yes" + LCMS_LIBS="-llcms" echo "#include <liblcms1/lcms.h>" > conftest.$ac_ext echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext @@ -1300,20 +1306,6 @@ else fi fi - -ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext -llcms 1>&5' - -if AC_TRY_EVAL(ac_link) && test -s conftest; then - AC_MSG_RESULT(yes) - HAVELCMS="yes" - LCMS_LIBS="-llcms" -else - AC_MSG_RESULT(no) - HAVELCMS="no" - LCMS_LIBS="" - DO_NOT_COMPILE="$DO_NOT_COMPILE krita" -fi - AC_SUBST(LCMS_LIBS) # IM 6.1.3 changed the number of arguments to GetMagickInfoList |