Merge pull request #55 from amigadave/master

Some small configure improvements

Makefile.am

@@ -125,7 +125,9 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = flatpak.pc
 EXTRA_DIST += flatpak.pc.in
 
-DISTCHECK_CONFIGURE_FLAGS =		\
+EXTRA_DIST += README.md
+
+AM_DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-documentation		\
 	--disable-maintainer-mode	\
 	--enable-introspection

configure.ac

@@ -22,7 +22,11 @@ m4_define([flatpak_binary_age],
 m4_define([flatpak_version],
           [flatpak_major_version.flatpak_minor_version.flatpak_micro_version])
 
-AC_INIT([flatpak],[flatpak_version])
+AC_INIT([Flatpak],
+        [flatpak_version],
+        [https://github.com/flatpak/flatpak/issues],
+        [flatpak],
+        [http://flatpak.org/])
 
 AC_USE_SYSTEM_EXTENSIONS
 
@@ -41,9 +45,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 no-define no-dist-gzip dist-xz tar-ustar foreign subdir-objects])
 AC_PROG_SED
 
-GETTEXT_PACKAGE=Flatpak
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$PACKAGE_NAME"],[gettext domain])
 
 AM_GLIB_GNU_GETTEXT
 
@@ -110,11 +112,7 @@ AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`])
 POLKIT_GOBJECT_REQUIRED=0.98
 
 PKG_CHECK_MODULES(BASE, [glib-2.0 gio-2.0 gio-unix-2.0])
-AC_SUBST(BASE_CFLAGS)
-AC_SUBST(BASE_LIBS)
 PKG_CHECK_MODULES(SOUP, [libsoup-2.4])
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
 
 PKG_CHECK_MODULES(POLKIT, \
 		  polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED)
@@ -126,8 +124,6 @@ AC_ARG_ENABLE([xauth],
               [enable_xauth=yes])
 if test "x$enable_xauth" = "xyes"; then
    PKG_CHECK_MODULES(XAUTH, [xau])
-   AC_SUBST(XAUTH_CFLAGS)
-   AC_SUBST(XAUTH_LIBS)
    AC_DEFINE([ENABLE_XAUTH], [1],
       [Define if using xauth])
 fi
@@ -143,8 +139,6 @@ if test "x$enable_sandboxed_triggers" = "xno"; then
 fi
 
 PKG_CHECK_MODULES(OSTREE, [libgsystem >= 2015.1 ostree-1 >= 2016.5])
-AC_SUBST(OSTREE_CFLAGS)
-AC_SUBST(OSTREE_LIBS)
 save_LIBS=$LIBS
 save_CFLAGS=$CFLAGS
 LIBS=$OSTREE_LIBS
@@ -160,12 +154,8 @@ CFLAGS=$save_CFLAGS
 
 
 PKG_CHECK_MODULES(FUSE, [fuse])
-AC_SUBST(FUSE_CFLAGS)
-AC_SUBST(FUSE_LIBS)
 
 PKG_CHECK_MODULES(JSON, [json-glib-1.0])
-AC_SUBST(JSON_CFLAGS)
-AC_SUBST(JSON_LIBS)
 
 AC_ARG_ENABLE([seccomp],
               AC_HELP_STRING([--disable-seccomp],
@@ -175,8 +165,6 @@ AC_ARG_ENABLE([seccomp],
 
 if test "x$enable_seccomp" = "xyes"; then
    PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp])
-   AC_SUBST(LIBSECCOMP_CFLAGS)
-   AC_SUBST(LIBSECCOMP_LIBS)
    AC_DEFINE([ENABLE_SECCOMP], [1],
       [Define if using seccomp])
 fi