← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kdeartwork/hardy-backports

« back to all changes in this revision

Viewing changes to acinclude.m4

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2008-02-14 12:27:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20080214122706-hfu103z9lyvj05g5
Tags: 4:3.5.9-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
acinclude.m4
1226
1226
  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
1227
1227
fi
1228
1228
if test $kde_qtver = 3; then
1229
 
  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
 
1229
  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
 
1230
  if test -z "$PKG_CONFIG"; then
 
1231
      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
1232
  fi
 
1233
  if test "$PKG_CONFIG" != "no" ; then
 
1234
    if $PKG_CONFIG --exists qt-mt ; then
 
1235
       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
 
1236
    fi
 
1237
  fi
1230
1238
fi
1231
1239
if test $kde_qtver = 2; then
1232
1240
   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
1443
1451
for dir in $kde_qt_dirs; do
1444
1452
   qt_incdirs="$qt_incdirs $dir/include $dir"
1445
1453
done
 
1454
if test -z "$PKG_CONFIG"; then
 
1455
    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
1456
fi
 
1457
if test "$PKG_CONFIG" != "no" ; then
 
1458
  if $PKG_CONFIG --exists qt-mt ; then
 
1459
      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
 
1460
  fi
 
1461
fi
1446
1462
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
1447
1463
if test ! "$ac_qt_includes" = "NO"; then
1448
1464
   qt_incdirs="$ac_qt_includes $qt_incdirs"
1459
1475
 
1460
1476
qt_libdirs=""
1461
1477
for dir in $kde_qt_dirs; do
1462
 
   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
 
1478
   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
1463
1479
done
 
1480
if test -z "$PKG_CONFIG"; then
 
1481
    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
1482
fi
 
1483
if test "$PKG_CONFIG" != "no" ; then
 
1484
  if $PKG_CONFIG --exists qt-mt ; then
 
1485
      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
 
1486
  fi
 
1487
fi
1464
1488
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465
1489
if test ! "$ac_qt_libraries" = "NO"; then
1466
1490
  qt_libdir=$ac_qt_libraries
2619
2643
AC_TRY_LINK(dnl
2620
2644
[
2621
2645
#include<zlib.h>
 
2646
#include<string.h>
2622
2647
],
2623
2648
[
2624
2649
  char buf[42];
2626
2651
  /* this would segfault.. but we only link, don't run */
2627
2652
  (void) gzgets(f, buf, sizeof(buf));
2628
2653
 
2629
 
  return (zlibVersion() == ZLIB_VERSION); 
 
2654
  return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
2630
2655
],
2631
2656
            eval "ac_cv_lib_z='-lz'",
2632
2657
            eval "ac_cv_lib_z=no")
2726
2751
     echo "*** to the full path to pkg-config."
2727
2752
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
2728
2753
  else
2729
 
     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
 
2754
     if ! $PKG_CONFIG --exists OpenEXR ; then
2730
2755
        AC_MSG_RESULT(no)
2731
2756
        EXRSTATUS=no
2732
2757
     else
2733
 
        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
 
2758
        if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
2734
2759
           AC_MSG_RESULT(no)
2735
2760
           EXRSTATUS=old
2736
2761
        else