aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-20 16:38:48 -0500
committerTed Gould <ted@gould.cx>2010-07-20 16:38:48 -0500
commitec7452bf38e9e58c2a87ff460b861473b90f321d (patch)
treead579f70e3c92622617c1c0c3d95c5be82407899 /configure
parent5990cf8bc53b7dee827d100085735a4235e240b9 (diff)
downloadlibdbusmenu-ec7452bf38e9e58c2a87ff460b861473b90f321d.tar.gz
libdbusmenu-ec7452bf38e9e58c2a87ff460b861473b90f321d.tar.bz2
libdbusmenu-ec7452bf38e9e58c2a87ff460b861473b90f321d.zip
Autogen update
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure145
1 files changed, 131 insertions, 14 deletions
diff --git a/configure b/configure
index 8d57d1f..479eed5 100755
--- a/configure
+++ b/configure
@@ -776,6 +776,8 @@ INTROSPECTION_COMPILER
INTROSPECTION_SCANNER
DBUSMENUTESTS_LIBS
DBUSMENUTESTS_CFLAGS
+DBUSMENUDUMPER_LIBS
+DBUSMENUDUMPER_CFLAGS
DBUSMENUGTK_LIBS
DBUSMENUGTK_CFLAGS
DBUSMENUGLIB_LIBS
@@ -981,6 +983,8 @@ DBUSMENUGLIB_CFLAGS
DBUSMENUGLIB_LIBS
DBUSMENUGTK_CFLAGS
DBUSMENUGTK_LIBS
+DBUSMENUDUMPER_CFLAGS
+DBUSMENUDUMPER_LIBS
DBUSMENUTESTS_CFLAGS
DBUSMENUTESTS_LIBS'
@@ -1653,6 +1657,10 @@ Some influential environment variables:
C compiler flags for DBUSMENUGTK, overriding pkg-config
DBUSMENUGTK_LIBS
linker flags for DBUSMENUGTK, overriding pkg-config
+ DBUSMENUDUMPER_CFLAGS
+ C compiler flags for DBUSMENUDUMPER, overriding pkg-config
+ DBUSMENUDUMPER_LIBS
+ linker flags for DBUSMENUDUMPER, overriding pkg-config
DBUSMENUTESTS_CFLAGS
C compiler flags for DBUSMENUTESTS, overriding pkg-config
DBUSMENUTESTS_LIBS
@@ -6285,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:6288: $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:6291: $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:6294: 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"
@@ -7496,7 +7504,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7499 "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=$?
@@ -8772,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:8775: $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:8779: \$? = $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.
@@ -9111,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:9114: $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:9118: \$? = $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.
@@ -9216,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:9219: $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:9223: \$? = $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
@@ -9271,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:9274: $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:9278: \$? = $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
@@ -11655,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 11658 "configure"
+#line 11666 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11751,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 11754 "configure"
+#line 11762 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12680,6 +12688,115 @@ fi
###########################
+# Dependencies - dumper
+###########################
+
+X11_REQUIRED_VERSION=1.3
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENUDUMPER" >&5
+$as_echo_n "checking for DBUSMENUDUMPER... " >&6; }
+
+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
+ x11 >= $X11_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DBUSMENUDUMPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ x11 >= $X11_REQUIRED_VERSION" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+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
+ x11 >= $X11_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DBUSMENUDUMPER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ x11 >= $X11_REQUIRED_VERSION" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ 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 --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
+
+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ x11 >= $X11_REQUIRED_VERSION) were not met:
+
+$DBUSMENUDUMPER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+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
+elif test $pkg_failed = untried; then
+ { { $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
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+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.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ DBUSMENUDUMPER_CFLAGS=$pkg_cv_DBUSMENUDUMPER_CFLAGS
+ DBUSMENUDUMPER_LIBS=$pkg_cv_DBUSMENUDUMPER_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+
+
+
+###########################
# Dependencies - Testing
###########################