Move the Avahi entries into sorted location

Change-Id: I35e638ffa0766fe39cdfef2123f1db31d9558438

config_host.mk.in

@@ -25,6 +25,8 @@ export AR=@AR@
 export ASSERT_ALWAYS_ABORT=@ASSERT_ALWAYS_ABORT@
 export ATL_INCLUDE=@ATL_INCLUDE@
 export ATL_LIB=@ATL_LIB@
+export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
+export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
 export LIBATOMIC_OPS_CFLAGS=$(gb_SPACE)@LIBATOMIC_OPS_CFLAGS@
 export LIBATOMIC_OPS_LIBS=$(gb_SPACE)@LIBATOMIC_OPS_LIBS@
 export AWTLIB=@AWTLIB@
@@ -103,6 +105,7 @@ export DOCDIR=@DOCDIR@
 export DOXYGEN=@DOXYGEN@
 export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DPKG=@DPKG@
+export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
@@ -116,7 +119,6 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
 export ENABLE_GCONF=@ENABLE_GCONF@
 export ENABLE_GIO=@ENABLE_GIO@
-export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
@@ -178,8 +180,6 @@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
 export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
 export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
 export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
-export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
-export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
 export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
 export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@