diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 247 |
1 files changed, 118 insertions, 129 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.8. +# Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.9. # # Report bugs to <ted@canonical.com>. # @@ -703,8 +703,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libdbusmenu' PACKAGE_TARNAME='libdbusmenu' -PACKAGE_VERSION='0.3.8' -PACKAGE_STRING='libdbusmenu 0.3.8' +PACKAGE_VERSION='0.3.9' +PACKAGE_STRING='libdbusmenu 0.3.9' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -800,8 +800,6 @@ GTK_DOC_BUILD_HTML_FALSE GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PKG_CONFIG HTML_DIR GTKDOC_MKPDF @@ -981,8 +979,6 @@ LIBS CPPFLAGS CPP PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR DBUSMENUGLIB_CFLAGS DBUSMENUGLIB_LIBS DBUSMENUGTK_CFLAGS @@ -1532,7 +1528,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdbusmenu 0.3.8 to adapt to many kinds of systems. +\`configure' configures libdbusmenu 0.3.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1602,7 +1598,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdbusmenu 0.3.8:";; + short | recursive ) echo "Configuration of libdbusmenu 0.3.9:";; esac cat <<\_ACEOF @@ -1653,10 +1649,6 @@ Some influential environment variables: you have headers in a nonstandard directory <include dir> CPP C preprocessor PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path DBUSMENUGLIB_CFLAGS C compiler flags for DBUSMENUGLIB, overriding pkg-config DBUSMENUGLIB_LIBS @@ -1740,7 +1732,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdbusmenu configure 0.3.8 +libdbusmenu configure 0.3.9 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2113,7 +2105,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdbusmenu $as_me 0.3.8, which was +It was created by libdbusmenu $as_me 0.3.9, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2927,7 +2919,7 @@ fi # Define the identity of the package. PACKAGE=libdbusmenu - VERSION=0.3.8 + VERSION=0.3.9 # Some tools Automake needs. @@ -6301,13 +6293,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6304: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6296: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6307: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6299: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6310: output\"" >&5) + (eval echo "\"\$as_me:6302: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7512,7 +7504,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7515 "configure"' > conftest.$ac_ext + echo '#line 7507 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8763,10 +8755,6 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -8792,11 +8780,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8795: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8783: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8799: \$? = $ac_status" >&5 + echo "$as_me:8787: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9131,11 +9119,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9134: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9122: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9138: \$? = $ac_status" >&5 + echo "$as_me:9126: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9236,11 +9224,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9239: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9227: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9243: \$? = $ac_status" >&5 + echo "$as_me:9231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9291,11 +9279,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9282: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9298: \$? = $ac_status" >&5 + echo "$as_me:9286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11675,7 +11663,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11678 "configure" +#line 11666 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11771,7 +11759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11774 "configure" +#line 11762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12021,10 +12009,6 @@ AM_BACKSLASH='\' - - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -12137,6 +12121,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } PKG_CONFIG="" fi + fi @@ -12468,10 +12453,11 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUGLIB" >&5 $as_echo_n "checking for DBUSMENUGLIB... " >&6; } -if test -n "$DBUSMENUGLIB_CFLAGS"; then - pkg_cv_DBUSMENUGLIB_CFLAGS="$DBUSMENUGLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUGLIB_CFLAGS"; then + pkg_cv_DBUSMENUGLIB_CFLAGS="$DBUSMENUGLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 @@ -12487,13 +12473,15 @@ if test -n "$DBUSMENUGLIB_CFLAGS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUSMENUGLIB_LIBS"; then - pkg_cv_DBUSMENUGLIB_LIBS="$DBUSMENUGLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUGLIB_LIBS"; then + pkg_cv_DBUSMENUGLIB_LIBS="$DBUSMENUGLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_REQUIRED_VERSION libxml-2.0 >= \$XML_REQUIRED_VERSION\""; } >&5 @@ -12509,15 +12497,14 @@ if test -n "$DBUSMENUGLIB_LIBS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12525,13 +12512,13 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION + DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` + libxml-2.0 >= $XML_REQUIRED_VERSION"` else - DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION + DBUSMENUGLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` + libxml-2.0 >= $XML_REQUIRED_VERSION"` fi # Put the nasty error message in config.log where it belongs echo "$DBUSMENUGLIB_PKG_ERRORS" >&5 @@ -12547,10 +12534,9 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUSMENUGLIB_CFLAGS and DBUSMENUGLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -12568,7 +12554,7 @@ else DBUSMENUGLIB_LIBS=$pkg_cv_DBUSMENUGLIB_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -12585,10 +12571,11 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUGTK" >&5 $as_echo_n "checking for DBUSMENUGTK... " >&6; } -if test -n "$DBUSMENUGTK_CFLAGS"; then - pkg_cv_DBUSMENUGTK_CFLAGS="$DBUSMENUGTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUGTK_CFLAGS"; then + pkg_cv_DBUSMENUGTK_CFLAGS="$DBUSMENUGTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_REQUIRED_VERSION @@ -12607,13 +12594,15 @@ if test -n "$DBUSMENUGTK_CFLAGS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUSMENUGTK_LIBS"; then - pkg_cv_DBUSMENUGTK_LIBS="$DBUSMENUGTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUGTK_LIBS"; then + pkg_cv_DBUSMENUGTK_LIBS="$DBUSMENUGTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_REQUIRED_VERSION @@ -12632,15 +12621,14 @@ if test -n "$DBUSMENUGTK_LIBS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12648,15 +12636,15 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` + libxml-2.0 >= $XML_REQUIRED_VERSION"` else - DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + DBUSMENUGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION" 2>&1` + libxml-2.0 >= $XML_REQUIRED_VERSION"` fi # Put the nasty error message in config.log where it belongs echo "$DBUSMENUGTK_PKG_ERRORS" >&5 @@ -12673,10 +12661,9 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUSMENUGTK_CFLAGS and DBUSMENUGTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -12694,7 +12681,7 @@ else DBUSMENUGTK_LIBS=$pkg_cv_DBUSMENUGTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -12711,10 +12698,11 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUDUMPER" >&5 $as_echo_n "checking for DBUSMENUDUMPER... " >&6; } -if test -n "$DBUSMENUDUMPER_CFLAGS"; then - pkg_cv_DBUSMENUDUMPER_CFLAGS="$DBUSMENUDUMPER_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUDUMPER_CFLAGS"; then + pkg_cv_DBUSMENUDUMPER_CFLAGS="$DBUSMENUDUMPER_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION x11 >= \$X11_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION @@ -12727,13 +12715,15 @@ if test -n "$DBUSMENUDUMPER_CFLAGS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUSMENUDUMPER_LIBS"; then - pkg_cv_DBUSMENUDUMPER_LIBS="$DBUSMENUDUMPER_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUDUMPER_LIBS"; then + pkg_cv_DBUSMENUDUMPER_LIBS="$DBUSMENUDUMPER_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION x11 >= \$X11_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION @@ -12746,15 +12736,14 @@ if test -n "$DBUSMENUDUMPER_LIBS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12762,11 +12751,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUSMENUDUMPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - x11 >= $X11_REQUIRED_VERSION" 2>&1` + DBUSMENUDUMPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + x11 >= $X11_REQUIRED_VERSION"` else - DBUSMENUDUMPER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - x11 >= $X11_REQUIRED_VERSION" 2>&1` + DBUSMENUDUMPER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + x11 >= $X11_REQUIRED_VERSION"` fi # Put the nasty error message in config.log where it belongs echo "$DBUSMENUDUMPER_PKG_ERRORS" >&5 @@ -12781,10 +12770,9 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUSMENUDUMPER_CFLAGS and DBUSMENUDUMPER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -12802,7 +12790,7 @@ else DBUSMENUDUMPER_LIBS=$pkg_cv_DBUSMENUDUMPER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -12820,10 +12808,11 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUTESTS" >&5 $as_echo_n "checking for DBUSMENUTESTS... " >&6; } -if test -n "$DBUSMENUTESTS_CFLAGS"; then - pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUTESTS_CFLAGS"; then + pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION @@ -12836,13 +12825,15 @@ if test -n "$DBUSMENUTESTS_CFLAGS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUSMENUTESTS_LIBS"; then - pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUSMENUTESTS_LIBS"; then + pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION @@ -12855,15 +12846,14 @@ if test -n "$DBUSMENUTESTS_LIBS"; then else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12871,11 +12861,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` + DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION"` else - DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` + DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION"` fi # Put the nasty error message in config.log where it belongs echo "$DBUSMENUTESTS_PKG_ERRORS" >&5 @@ -12890,10 +12880,9 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUSMENUTESTS_CFLAGS and DBUSMENUTESTS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -12911,7 +12900,7 @@ else DBUSMENUTESTS_LIBS=$pkg_cv_DBUSMENUTESTS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -13065,7 +13054,7 @@ fi ########################### LIBDBUSMENU_CURRENT=1 -LIBDBUSMENU_REVISION=11 +LIBDBUSMENU_REVISION=12 LIBDBUSMENU_AGE=0 @@ -14378,7 +14367,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdbusmenu $as_me 0.3.8, which was +This file was extended by libdbusmenu $as_me 0.3.9, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14444,7 +14433,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdbusmenu config.status 0.3.8 +libdbusmenu config.status 0.3.9 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" |