View | Details | Raw Unified | Return to bug 83689 | Differences between
and this patch

Collapse All | Expand All

(-)configure (+98 lines)
Lines 24288-24293 Link Here
24288
     have_libpng=false
24288
     have_libpng=false
24289
  fi
24289
  fi
24290
24290
24291
  if test x$have_libpng = xfalse ; then
24292
24293
  succeeded=no
24294
24295
  if test -z "$PKG_CONFIG"; then
24296
    # Extract the first word of "pkg-config", so it can be a program name with args.
24297
set dummy pkg-config; ac_word=$2
24298
echo "$as_me:$LINENO: checking for $ac_word" >&5
24299
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
24300
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
24301
  echo $ECHO_N "(cached) $ECHO_C" >&6
24302
else
24303
  case $PKG_CONFIG in
24304
  [\\/]* | ?:[\\/]*)
24305
  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
24306
  ;;
24307
  *)
24308
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
24309
for as_dir in $PATH
24310
do
24311
  IFS=$as_save_IFS
24312
  test -z "$as_dir" && as_dir=.
24313
  for ac_exec_ext in '' $ac_executable_extensions; do
24314
  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
24315
    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
24316
    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
24317
    break 2
24318
  fi
24319
done
24320
done
24321
24322
  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
24323
  ;;
24324
esac
24325
fi
24326
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
24327
24328
if test -n "$PKG_CONFIG"; then
24329
  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
24330
echo "${ECHO_T}$PKG_CONFIG" >&6
24331
else
24332
  echo "$as_me:$LINENO: result: no" >&5
24333
echo "${ECHO_T}no" >&6
24334
fi
24335
24336
  fi
24337
24338
  if test "$PKG_CONFIG" = "no" ; then
24339
     echo "*** The pkg-config script could not be found. Make sure it is"
24340
     echo "*** in your path, or set the PKG_CONFIG environment variable"
24341
     echo "*** to the full path to pkg-config."
24342
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
24343
  else
24344
     PKG_CONFIG_MIN_VERSION=0.9.0
24345
     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
24346
        echo "$as_me:$LINENO: checking for libpng12" >&5
24347
echo $ECHO_N "checking for libpng12... $ECHO_C" >&6
24348
24349
        if $PKG_CONFIG --exists "libpng12" ; then
24350
            echo "$as_me:$LINENO: result: yes" >&5
24351
echo "${ECHO_T}yes" >&6
24352
            succeeded=yes
24353
24354
            echo "$as_me:$LINENO: checking LIBPNG_CFLAGS" >&5
24355
echo $ECHO_N "checking LIBPNG_CFLAGS... $ECHO_C" >&6
24356
            LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12"`
24357
            echo "$as_me:$LINENO: result: $LIBPNG_CFLAGS" >&5
24358
echo "${ECHO_T}$LIBPNG_CFLAGS" >&6
24359
24360
            echo "$as_me:$LINENO: checking LIBPNG_LIBS" >&5
24361
echo $ECHO_N "checking LIBPNG_LIBS... $ECHO_C" >&6
24362
            LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng12"`
24363
            echo "$as_me:$LINENO: result: $LIBPNG_LIBS" >&5
24364
echo "${ECHO_T}$LIBPNG_LIBS" >&6
24365
        else
24366
            LIBPNG_CFLAGS=""
24367
            LIBPNG_LIBS=""
24368
            ## If we have a custom action on failure, don't print errors, but
24369
            ## do set a variable so people can do so.
24370
            LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"`
24371
24372
        fi
24373
24374
24375
24376
     else
24377
        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
24378
        echo "*** See http://www.freedesktop.org/software/pkgconfig"
24379
     fi
24380
  fi
24381
24382
  if test $succeeded = yes; then
24383
     have_libpng=true
24384
  else
24385
     have_libpng=false
24386
  fi
24387
24388
  fi
24291
fi
24389
fi

Return to bug 83689