imlib2-config is no more Index: configure --- configure.orig +++ configure @@ -19773,101 +19773,8 @@ esac fi IMLIB2_CONFIG=$ac_cv_path_IMLIB2_CONFIG -if test -n "$IMLIB2_CONFIG"; then - echo "$as_me:$LINENO: result: $IMLIB2_CONFIG" >&5 -echo "${ECHO_T}$IMLIB2_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - echo "$as_me:$LINENO: checking for imlib2 - version >= 1.0.0" >&5 -echo $ECHO_N "checking for imlib2 - version >= 1.0.0... $ECHO_C" >&6 - - no_imlib2="" - if test "$IMLIB2_CONFIG" = "no" ; then - no_imlib2=yes - else - IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`" - IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`" - - imlib2_config_major_version=`$IMLIB2_CONFIG $imlib2_config_args \ - --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - imlib2_config_minor_version=`$IMLIB2_CONFIG $imlib2_config_args \ - --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - imlib2_config_micro_version=`$IMLIB2_CONFIG $imlib2_config_args \ - --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - imlib2_wanted_major_version="1" - imlib2_wanted_minor_version="0" - imlib2_wanted_micro_version="0" - - # Compare wanted version to what config script returned. - # If I knew what library was being run, i'd probably also compile - # a test program at this point (which also extracted and tested - # the version in some library-specific way) - if test "$imlib2_config_major_version" -lt \ - "$imlib2_wanted_major_version" \ - -o \( "$imlib2_config_major_version" -eq \ - "$imlib2_wanted_major_version" \ - -a "$imlib2_config_minor_version" -lt \ - "$imlib2_wanted_minor_version" \) \ - -o \( "$imlib2_config_major_version" -eq \ - "$imlib2_wanted_major_version" \ - -a "$imlib2_config_minor_version" -eq \ - "$imlib2_wanted_minor_version" \ - -a "$imlib2_config_micro_version" -lt \ - "$imlib2_wanted_micro_version" \) ; then - # older version found - no_imlib2=yes - echo -n "*** An old version of imlib2 " - echo -n "($imlib2_config_major_version" - echo -n ".$imlib2_config_minor_version" - echo ".$imlib2_config_micro_version) was found." - echo -n "*** You need a version of imlib2 newer than " - echo -n "$imlib2_wanted_major_version" - echo -n ".$imlib2_wanted_minor_version" - echo ".$imlib2_wanted_micro_version." - echo "***" - echo "*** If you have already installed a sufficiently new version, this error" - echo "*** probably means that the wrong copy of the imlib2-config shell script is" - echo "*** being found. The easiest way to fix this is to remove the old version" - echo "*** of imlib2, but you can also set the IMLIB2_CONFIG environment to point to the" - echo "*** correct copy of imlib2-config. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" - echo "*** so that the correct libraries are found at run-time)" - fi - - fi - if test "x$no_imlib2" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - - - - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "$IMLIB2_CONFIG" = "no" ; then - echo "*** The imlib2-config script installed by imlib2 could not be found" - echo "*** If imlib2 was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the IMLIB2_CONFIG environment variable to the" - echo "*** full path to imlib2-config." - fi - IMLIB2_CFLAGS="" - IMLIB2_LIBS="" - { { echo "$as_me:$LINENO: error: Cannot find imlib2: Is imlib2-config in the path?" >&5 -echo "$as_me: error: Cannot find imlib2: Is imlib2-config in the path?" >&2;} - { (exit 1); exit 1; }; } - fi - - - - - - - -IMLIB_LIBS=`imlib2-config --libs` -IMLIB_CFLAGS=`imlib2-config --cflags` +IMLIB_LIBS=`pkg-config --libs imlib2` +IMLIB_CFLAGS=`pkg-config --cflags imlib2`