* Upstream Merge:

  * GDBus Port
* autogen.sh
* debian/control: Migrating library versions from 1 to 2

1 files changed, 32 insertions, 46 deletions

diff --git a/configure b/configure
index 817306d..adcffc5 100755
--- a/configure
+++ b/configure
@@ -8023,6 +8023,10 @@ _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=
@@ -8048,11 +8052,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:8051: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8055: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8055: \$? = $ac_status" >&5
+   echo "$as_me:8059: \$? = $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.
@@ -8387,11 +8391,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:8390: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8394: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8394: \$? = $ac_status" >&5
+   echo "$as_me:8398: \$? = $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.
@@ -8492,11 +8496,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:8495: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8499: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8499: \$? = $ac_status" >&5
+   echo "$as_me:8503: \$? = $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
@@ -8547,11 +8551,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:8550: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8554: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8554: \$? = $ac_status" >&5
+   echo "$as_me:8558: \$? = $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
@@ -10931,7 +10935,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10934 "configure"
+#line 10938 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11027,7 +11031,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11030 "configure"
+#line 11034 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11512,17 +11516,14 @@ if test -n "$LIBINDICATOR_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11534,17 +11535,14 @@ if test -n "$LIBINDICATOR_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11565,19 +11563,16 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1`
         else
 	        LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBINDICATOR_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met:
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met:
 
 $LIBINDICATOR_PKG_ERRORS
 
@@ -11623,17 +11618,14 @@ if test -n "$LIBINDICATOR_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11645,17 +11637,14 @@ if test -n "$LIBINDICATOR_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5
+                                          gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11676,19 +11665,16 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1`
         else
 	        LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1`
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBINDICATOR_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met:
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met:
 
 $LIBINDICATOR_PKG_ERRORS