[gnome-flashback] rewrite configure.ac

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-flashback] rewrite configure.ac
Date: Tue, 15 Sep 2015 01:00:53 +0000 (UTC)
commit 160b6fa1a7d5f8fc692deab4a6c260c8cc65ca99
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Sep 15 03:59:10 2015 +0300

    rewrite configure.ac

 configure.ac |  310 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 208 insertions(+), 102 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5ecdf7a..4b56bea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,39 +1,89 @@
-m4_define([gnome_flashback_major_version], [3])
-m4_define([gnome_flashback_minor_version], [17])
-m4_define([gnome_flashback_micro_version], [2])
+dnl **************************************************************************
+dnl Define version info
+dnl **************************************************************************
 
-AC_INIT([gnome-flashback], 
[gnome_flashback_major_version.gnome_flashback_minor_version.gnome_flashback_micro_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-flashback])
+m4_define([gf_major_version], [3])
+m4_define([gf_minor_version], [17])
+m4_define([gf_micro_version], [2])
+m4_define([gf_version], [gf_major_version.gf_minor_version.gf_micro_version])
 
-AX_IS_RELEASE([git-directory])
+dnl **************************************************************************
+dnl Define bugzilla address
+dnl **************************************************************************
+
+m4_define([gf_bugzilla_url],
+          [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-flashback])
+
+dnl **************************************************************************
+dnl Initialize autoconf
+dnl **************************************************************************
 
-AC_CONFIG_HEADERS(config.h)
+AC_INIT([gnome-flashback], [gf_version], [gf_bugzilla_url])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AM_MAINTAINER_MODE([enable])
+dnl **************************************************************************
+dnl Set release policy
+dnl **************************************************************************
+
+AX_IS_RELEASE([git-directory])
+
+dnl **************************************************************************
+dnl Enable debug
+dnl **************************************************************************
 
 AX_CHECK_ENABLE_DEBUG([yes])
 
-AC_PROG_CC
+dnl **************************************************************************
+dnl Add warning flags
+dnl **************************************************************************
 
 AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
 
+dnl **************************************************************************
+dnl Initialize automake
+dnl **************************************************************************
+
+AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz tar-ustar -Wno-portability])
+AM_MAINTAINER_MODE([enable])
+AM_SILENT_RULES([yes])
+
+dnl **************************************************************************
+dnl Initialize libtool
+dnl **************************************************************************
+
 LT_INIT
 
-AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
+dnl **************************************************************************
+dnl Check for required programs
+dnl **************************************************************************
+
+AC_PROG_CC
+AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+
+dnl **************************************************************************
+dnl Internationalization
+dnl **************************************************************************
 
-AM_GNU_GETTEXT_VERSION([0.19.4])
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.4])
 
 GETTEXT_PACKAGE=gnome-flashback
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define the gettext package to be used])
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+                   [Define the gettext package to be used])
+
+dnl **************************************************************************
+dnl Desktop settings support
+dnl **************************************************************************
 
 GLIB_GSETTINGS
 
+dnl **************************************************************************
+dnl Check forrequired packages
+dnl **************************************************************************
+
 GTK_REQUIRED=3.15.2
 LIBGNOME_DESKTOP_REQUIRED=3.12.0
 CANBERRA_REQUIRED=0.13
@@ -42,113 +92,169 @@ GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=3.12.0
 POLKIT_AGENT_REQUIRED=0.97
 POLKIT_GOBJECT_REQUIRED=0.97
 IBUS_REQUIRED=1.5.10
+UPOWER_GLIB_REQUIRED=0.99.0
+
+PKG_CHECK_MODULES([GNOME_FLASHBACK], [
+  gtk+-3.0 >= $GTK_REQUIRED
+])
 
-PKG_CHECK_MODULES(GNOME_FLASHBACK, gtk+-3.0 >= $GTK_REQUIRED dbus-glib-1)
-AC_SUBST(GNOME_FLASHBACK_CFLAGS)
-AC_SUBST(GNOME_FLASHBACK_LIBS)
+PKG_CHECK_MODULES([AUTOMOUNT_MANAGER], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+])
 
-PKG_CHECK_MODULES(AUTOMOUNT_MANAGER, gtk+-3.0 >= $GTK_REQUIRED gsettings-desktop-schemas >= 
$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED)
-AC_SUBST(AUTOMOUNT_MANAGER_CFLAGS)
-AC_SUBST(AUTOMOUNT_MANAGER_LIBS)
+PKG_CHECK_MODULES([BLUETOOTH_APPLET], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  gnome-bluetooth-1.0
+])
 
-PKG_CHECK_MODULES(BLUETOOTH_APPLET, gtk+-3.0 >= $GTK_REQUIRED gnome-bluetooth-1.0)
-AC_SUBST(BLUETOOTH_APPLET_CFLAGS)
-AC_SUBST(BLUETOOTH_APPLET_LIBS)
+PKG_CHECK_MODULES([DESKTOP_BACKGROUND], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
+])
 
-PKG_CHECK_MODULES(DESKTOP_BACKGROUND, gtk+-3.0 >= $GTK_REQUIRED gnome-desktop-3.0 >= 
$LIBGNOME_DESKTOP_REQUIRED)
-AC_SUBST(DESKTOP_BACKGROUND_CFLAGS)
-AC_SUBST(DESKTOP_BACKGROUND_LIBS)
+PKG_CHECK_MODULES([DISPLAY_CONFIG], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  glib-2.0 >= $GLIB_REQUIRED
+  gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
+  upower-glib >= $UPOWER_GLIB_REQUIRED
+  x11
+  xext
+  xrandr
+  x11-xcb
+  xcb-randr
+])
 
-PKG_CHECK_MODULES(DISPLAY_CONFIG, gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= 
$LIBGNOME_DESKTOP_REQUIRED upower-glib >= 0.99.0 x11 xext xrandr x11-xcb xcb-randr)
-AC_SUBST(DISPLAY_CONFIG_CFLAGS)
-AC_SUBST(DISPLAY_CONFIG_LIBS)
+PKG_CHECK_MODULES([END_SESSION_DIALOG], [
+  gtk+-3.0 >= $GTK_REQUIRED
+])
 
-PKG_CHECK_MODULES(END_SESSION_DIALOG, gtk+-3.0 >= $GTK_REQUIRED)
-AC_SUBST(END_SESSION_DIALOG_CFLAGS)
-AC_SUBST(END_SESSION_DIALOG_LIBS)
+PKG_CHECK_MODULES([IDLE_MONITOR], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  x11
+  xext
+])
 
-PKG_CHECK_MODULES(IDLE_MONITOR, gtk+-3.0 >= $GTK_REQUIRED x11 xext)
-AC_SUBST(IDLE_MONITOR_CFLAGS)
-AC_SUBST(IDLE_MONITOR_LIBS)
+PKG_CHECK_MODULES([INPUT_SOURCES], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  ibus-1.0 >= $IBUS_REQUIRED
+])
 
-PKG_CHECK_MODULES([INPUT_SOURCES], [gtk+-3.0 >= $GTK_REQUIRED ibus-1.0 >= $IBUS_REQUIRED])
-AC_SUBST([INPUT_SOURCES_CFLAGS])
-AC_SUBST([INPUT_SOURCES_LIBS])
+PKG_CHECK_MODULES([POLKIT], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  glib-2.0 >= $GLIB_REQUIRED
+  polkit-agent-1 >= $POLKIT_AGENT_REQUIRED
+  polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED
+])
 
-PKG_CHECK_MODULES(POLKIT, gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED polkit-agent-1 >= 
$POLKIT_AGENT_REQUIRED polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED)
-AC_SUBST(POLKIT_CFLAGS)
-AC_SUBST(POLKIT_LIBS)
+PKG_CHECK_MODULES([POWER_APPLET], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  upower-glib
+])
 
-PKG_CHECK_MODULES(POWER_APPLET, gtk+-3.0 >= $GTK_REQUIRED upower-glib)
-AC_SUBST(POWER_APPLET_CFLAGS)
-AC_SUBST(POWER_APPLET_LIBS)
+PKG_CHECK_MODULES([SCREENCAST], [
+  gtk+-3.0 >= $GTK_REQUIRED
+])
 
-PKG_CHECK_MODULES(SCREENCAST, gtk+-3.0 >= $GTK_REQUIRED)
-AC_SUBST(SCREENCAST_CFLAGS)
-AC_SUBST(SCREENCAST_LIBS)
+PKG_CHECK_MODULES([SCREENSHOT], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  x11
+  xext
+])
 
-PKG_CHECK_MODULES(SCREENSHOT, gtk+-3.0 >= $GTK_REQUIRED x11 xext)
-AC_SUBST(SCREENSHOT_CFLAGS)
-AC_SUBST(SCREENSHOT_LIBS)
+PKG_CHECK_MODULES([SHELL], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  glib-2.0 >= $GLIB_REQUIRED
+  gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
+  x11
+])
 
-PKG_CHECK_MODULES(SHELL, gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= 
$LIBGNOME_DESKTOP_REQUIRED x11)
-AC_SUBST(SHELL_CFLAGS)
-AC_SUBST(SHELL_LIBS)
+PKG_CHECK_MODULES([GVC], [
+  gobject-2.0
+  libpulse
+  libpulse-mainloop-glib
+])
 
-PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib)
-AM_CONDITIONAL(HAVE_INTROSPECTION, false)
+PKG_CHECK_MODULES([SOUND_APPLET], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  libcanberra-gtk3 >= $CANBERRA_REQUIRED
+  glib-2.0 >= $GLIB_REQUIRED
+])
 
-PKG_CHECK_MODULES(SOUND_APPLET, gtk+-3.0 >= $GTK_REQUIRED libcanberra-gtk3 >= $CANBERRA_REQUIRED glib-2.0 >= 
$GLIB_REQUIRED)
-AC_SUBST(SOUND_APPLET_CFLAGS)
-AC_SUBST(SOUND_APPLET_LIBS)
+PKG_CHECK_MODULES([WORKAROUNDS], [
+  glib-2.0 >= $GLIB_REQUIRED
+  gtk+-3.0 >= $GTK_REQUIRED
+  x11
+])
 
-PKG_CHECK_MODULES(WORKAROUNDS, glib-2.0 >= $GLIB_REQUIRED gtk+-3.0 >= $GTK_REQUIRED x11)
-AC_SUBST(WORKAROUNDS_CFLAGS)
-AC_SUBST(WORKAROUNDS_LIBS)
+dnl **************************************************************************
+dnl Tell gvc submodule to not build introspection
+dnl **************************************************************************
 
-PKG_CHECK_EXISTS([xrandr >= 1.5.0], AC_DEFINE([HAVE_XRANDR15], [1], [Define if you have support for XRandR 
1.5 or greater]))
+AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
 
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-data/applications/Makefile
-data/autostart/Makefile
-data/directories/Makefile
-data/menus/Makefile
-data/schemas/Makefile
-data/sessions/Makefile
-data/xsessions/Makefile
-gnome-flashback/Makefile
-gnome-flashback/libautomount-manager/Makefile
-gnome-flashback/libbluetooth-applet/Makefile
-gnome-flashback/libdesktop-background/Makefile
-gnome-flashback/libdisplay-config/Makefile
-gnome-flashback/libend-session-dialog/Makefile
-gnome-flashback/libidle-monitor/Makefile
-gnome-flashback/libinput-sources/Makefile
-gnome-flashback/libpolkit/Makefile
-gnome-flashback/libpower-applet/Makefile
-gnome-flashback/libscreencast/Makefile
-gnome-flashback/libscreenshot/Makefile
-gnome-flashback/libshell/Makefile
-gnome-flashback/libsound-applet/Makefile
-gnome-flashback/libsound-applet/gvc/Makefile
-gnome-flashback/libworkarounds/Makefile
-po/Makefile.in
-])
+dnl **************************************************************************
+dnl Check if we have XRandR 1.5 or newer
+dnl **************************************************************************
 
-AC_OUTPUT
+PKG_CHECK_EXISTS([xrandr >= 1.5.0],
+                 AC_DEFINE([HAVE_XRANDR15], [1],
+                           [Define if XRandR is 1.5.0 or newer]))
 
-echo "
-    gnome-flashback $VERSION
-    `echo gnome-flashback $VERSION | sed "s/./=/g"`
+dnl **************************************************************************
+dnl Process .in files
+dnl **************************************************************************
 
-    prefix:                        ${prefix}
-    exec_prefix:                   ${exec_prefix}
+AC_CONFIG_FILES([
+  Makefile
+
+  data/Makefile
+  data/applications/Makefile
+  data/autostart/Makefile
+  data/directories/Makefile
+  data/menus/Makefile
+  data/schemas/Makefile
+  data/sessions/Makefile
+  data/xsessions/Makefile
+
+  gnome-flashback/Makefile
+  gnome-flashback/libautomount-manager/Makefile
+  gnome-flashback/libbluetooth-applet/Makefile
+  gnome-flashback/libdesktop-background/Makefile
+  gnome-flashback/libdisplay-config/Makefile
+  gnome-flashback/libend-session-dialog/Makefile
+  gnome-flashback/libidle-monitor/Makefile
+  gnome-flashback/libinput-sources/Makefile
+  gnome-flashback/libpolkit/Makefile
+  gnome-flashback/libpower-applet/Makefile
+  gnome-flashback/libscreencast/Makefile
+  gnome-flashback/libscreenshot/Makefile
+  gnome-flashback/libshell/Makefile
+  gnome-flashback/libsound-applet/Makefile
+  gnome-flashback/libsound-applet/gvc/Makefile
+  gnome-flashback/libworkarounds/Makefile
+
+  po/Makefile.in
+])
 
-    sysconfdir:                    ${sysconfdir}
-    libexecdir:                    ${libexecdir}
+AC_OUTPUT
 
-    source code location:          ${srcdir}
-    compiler:                      ${CC}
-"
+dnl **************************************************************************
+dnl Show build info
+dnl **************************************************************************
+
+echo ""
+echo "  GNOME Flashback $VERSION"
+echo "  `echo GNOME Flashback $VERSION | sed "s/./=/g"`"
+echo ""
+echo "  srcdir ......................: ${srcdir}"
+echo ""
+echo "  compiler ....................: ${CC}"
+echo "  cflags ......................: ${CFLAGS}"
+echo ""
+echo "  prefix ......................: ${prefix}"
+echo "  exec_prefix .................: ${exec_prefix}"
+echo "  libdir ......................: ${libdir}"
+echo "  sysconfdir ..................: ${sysconfdir}"
+echo "  libexecdir ..................: ${libexecdir}"
+echo ""
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]