From 7474743ceb1b9e066868517c8f98da033094d129 Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick@xfce.org>
Date: Sun, 6 Jan 2013 12:19:05 +0100
Subject: Autotools updates.

---
 configure.ac.in     | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in.in     | 180 ----------------------------------------------------
 gtk-2.0/Makefile.am |   2 +-
 gtk-3.0/Makefile.am |   2 +-
 4 files changed, 182 insertions(+), 182 deletions(-)
 create mode 100644 configure.ac.in
 delete mode 100644 configure.in.in

diff --git a/configure.ac.in b/configure.ac.in
new file mode 100644
index 0000000..2ec6671
--- /dev/null
+++ b/configure.ac.in
@@ -0,0 +1,180 @@
+dnl
+dnl Copyright (c) 2004-2011 The Xfce development team
+dnl
+
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([gtk_xfce_engine_version_major], [3])
+m4_define([gtk_xfce_engine_version_minor], [0])
+m4_define([gtk_xfce_engine_version_micro], [1])
+m4_define([gtk_xfce_engine_version_nano],  []) dnl leave this empty to have no nano version
+m4_define([gtk_xfce_engine_version_build], [@REVISION@])
+m4_define([gtk_xfce_engine_version_tag],   [git])
+m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])])
+
+dnl *******************************************
+dnl *** Debugging support for GIT snapshots ***
+dnl *******************************************
+m4_define([gtk_xfce_engine_debug_default], [ifelse(gtk_xfce_engine_version_tag(), [git], [yes], [minimum])])
+
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2002-2012 The Xfce development team. All rights reserved.])
+AC_INIT([gtk-xfce-engine], [gtk_xfce_engine_version], [http://bugzilla.xfce.org/])
+AC_PREREQ([2.50])
+AC_REVISION([gtk_xfce_engine_version_build])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_INSTALL()
+
+dnl *************************
+dnl *** Check for libtool ***
+dnl *************************
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+AM_PATH_GLIB_2_0([2.24.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0])
+dnl libm is needed for floor() and ceil()
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
+dnl ***********************************
+dnl *** Check for optional packages ***
+dnl ***********************************
+XDT_CHECK_OPTIONAL_PACKAGE([GTK2], [gtk+-2.0], [2.20.0], [gtk2], [Gtk 2 theme engine])
+XDT_CHECK_OPTIONAL_PACKAGE([GTK3], [gtk+-3.0], [3.2.0], [gtk3], [Gtk 3 theme engine])
+
+GTK_SUBDIRS=""
+if test x"$GTK2_FOUND" = x"yes"
+then
+  GTK2_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+  AC_SUBST([GTK2_BINARY_VERSION])
+  GTK_SUBDIRS="$GTK_SUBDIRS gtk-2.0"
+fi
+if test x"$GTK3_FOUND" = x"yes"
+then
+  GTK3_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+  AC_SUBST([GTK3_BINARY_VERSION])
+  GTK_SUBDIRS="$GTK_SUBDIRS gtk-3.0"
+fi
+AC_SUBST([GTK_SUBDIRS])
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+XDT_FEATURE_DEBUG([gtk_xfce_engine_debug_default])
+
+dnl *********************************
+dnl *** Substitute platform flags ***
+dnl *********************************
+AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
+AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS])
+AC_MSG_CHECKING([PLATFORM_CFLAGS])
+AC_MSG_RESULT([$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_CFLAGS])
+AC_MSG_CHECKING([PLATFORM_LDFLAGS])
+AC_MSG_RESULT([$PLATFORM_LDFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS])
+
+AC_OUTPUT([
+Makefile
+gtk-2.0/Makefile
+gtk-3.0/Makefile
+themes/b5/Makefile
+themes/b5/gtk-2.0/Makefile
+themes/b5/gtk-3.0/Makefile
+themes/xfce/gtk-2.0/Makefile
+themes/xfce/gtk-3.0/Makefile
+themes/xfce/Makefile
+themes/xfce-4.0/gtk-2.0/Makefile
+themes/xfce-4.0/gtk-3.0/Makefile
+themes/xfce-4.0/Makefile
+themes/xfce-4.2/gtk-2.0/Makefile
+themes/xfce-4.2/gtk-3.0/Makefile
+themes/xfce-4.2/Makefile
+themes/xfce-4.4/Makefile
+themes/xfce-4.4/gtk-2.0/Makefile
+themes/xfce-4.4/gtk-3.0/Makefile
+themes/xfce-4.6/Makefile
+themes/xfce-4.6/gtk-2.0/Makefile
+themes/xfce-4.6/gtk-3.0/Makefile
+themes/basic/gtk-2.0/Makefile
+themes/basic/gtk-3.0/Makefile
+themes/basic/Makefile
+themes/cadmium/gtk-2.0/Makefile
+themes/cadmium/gtk-3.0/Makefile
+themes/cadmium/Makefile
+themes/curve/gtk-2.0/Makefile
+themes/curve/gtk-3.0/Makefile
+themes/curve/Makefile
+themes/dawn/gtk-2.0/Makefile
+themes/dawn/gtk-3.0/Makefile
+themes/dawn/Makefile
+themes/dusk/gtk-2.0/Makefile
+themes/dusk/gtk-3.0/Makefile
+themes/dusk/Makefile
+themes/kolors/gtk-2.0/Makefile
+themes/kolors/gtk-3.0/Makefile
+themes/kolors/Makefile
+themes/kde2/gtk-2.0/Makefile
+themes/kde2/gtk-3.0/Makefile
+themes/kde2/Makefile
+themes/light/Makefile
+themes/light/gtk-2.0/Makefile
+themes/light/gtk-3.0/Makefile
+themes/orange/gtk-2.0/Makefile
+themes/orange/gtk-3.0/Makefile
+themes/orange/Makefile
+themes/redmondxp/gtk-2.0/Makefile
+themes/redmondxp/gtk-3.0/Makefile
+themes/redmondxp/Makefile
+themes/saltlake/gtk-2.0/Makefile
+themes/saltlake/gtk-3.0/Makefile
+themes/saltlake/Makefile
+themes/smooth/gtk-2.0/Makefile
+themes/smooth/gtk-3.0/Makefile
+themes/smooth/Makefile
+themes/stellar/gtk-2.0/Makefile
+themes/stellar/gtk-3.0/Makefile
+themes/stellar/Makefile
+themes/winter/gtk-2.0/Makefile
+themes/winter/gtk-3.0/Makefile
+themes/winter/Makefile
+themes/Makefile
+])
+
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+echo "* Gtk 2 Engine: $GTK2_FOUND"
+echo "* Gtk 3 Engine: $GTK3_FOUND"
+echo
+echo "* Install Prefix: $prefix"
+echo "* Debug Support: $enable_debug"
+echo
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index eba32bf..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,180 +0,0 @@
-dnl
-dnl Copyright (c) 2004-2011 The Xfce development team
-dnl
-
-dnl ***************************
-dnl *** Version information ***
-dnl ***************************
-m4_define([gtk_xfce_engine_version_major], [3])
-m4_define([gtk_xfce_engine_version_minor], [0])
-m4_define([gtk_xfce_engine_version_micro], [1])
-m4_define([gtk_xfce_engine_version_nano],  []) dnl leave this empty to have no nano version
-m4_define([gtk_xfce_engine_version_build], [@REVISION@])
-m4_define([gtk_xfce_engine_version_tag],   [git])
-m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])])
-
-dnl *******************************************
-dnl *** Debugging support for GIT snapshots ***
-dnl *******************************************
-m4_define([gtk_xfce_engine_debug_default], [ifelse(gtk_xfce_engine_version_tag(), [git], [yes], [minimum])])
-
-dnl ***************************
-dnl *** Initialize autoconf ***
-dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2002-2012 The Xfce development team. All rights reserved.])
-AC_INIT([gtk-xfce-engine], [gtk_xfce_engine_version], [http://bugzilla.xfce.org/])
-AC_PREREQ([2.50])
-AC_REVISION([gtk_xfce_engine_version_build])
-
-dnl ***************************
-dnl *** Initialize automake ***
-dnl ***************************
-AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
-AM_MAINTAINER_MODE()
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl ********************************
-dnl *** Check for basic programs ***
-dnl ********************************
-AC_PROG_CC()
-AC_PROG_INSTALL()
-
-dnl *************************
-dnl *** Check for libtool ***
-dnl *************************
-LT_PREREQ([2.2.6])
-LT_INIT([disable-static])
-
-dnl **********************************
-dnl *** Check for standard headers ***
-dnl **********************************
-AC_HEADER_STDC()
-
-dnl ***********************************
-dnl *** Check for required packages ***
-dnl ***********************************
-AM_PATH_GLIB_2_0([2.24.0])
-XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0])
-dnl libm is needed for floor() and ceil()
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-dnl ***********************************
-dnl *** Check for optional packages ***
-dnl ***********************************
-XDT_CHECK_OPTIONAL_PACKAGE([GTK2], [gtk+-2.0], [2.20.0], [gtk2], [Gtk 2 theme engine])
-XDT_CHECK_OPTIONAL_PACKAGE([GTK3], [gtk+-3.0], [3.2.0], [gtk3], [Gtk 3 theme engine])
-
-GTK_SUBDIRS=""
-if test x"$GTK2_FOUND" = x"yes"
-then
-  GTK2_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-  AC_SUBST([GTK2_BINARY_VERSION])
-  GTK_SUBDIRS="$GTK_SUBDIRS gtk-2.0"
-fi
-if test x"$GTK3_FOUND" = x"yes"
-then
-  GTK3_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
-  AC_SUBST([GTK3_BINARY_VERSION])
-  GTK_SUBDIRS="$GTK_SUBDIRS gtk-3.0"
-fi
-AC_SUBST([GTK_SUBDIRS])
-
-dnl ***********************************
-dnl *** Check for debugging support ***
-dnl ***********************************
-XDT_FEATURE_DEBUG([gtk_xfce_engine_debug_default])
-
-dnl *********************************
-dnl *** Substitute platform flags ***
-dnl *********************************
-AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
-AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
-AC_SUBST([PLATFORM_CPPFLAGS])
-AC_MSG_CHECKING([PLATFORM_CFLAGS])
-AC_MSG_RESULT([$PLATFORM_CFLAGS])
-AC_SUBST([PLATFORM_CFLAGS])
-AC_MSG_CHECKING([PLATFORM_LDFLAGS])
-AC_MSG_RESULT([$PLATFORM_LDFLAGS])
-AC_SUBST([PLATFORM_LDFLAGS])
-
-AC_OUTPUT([
-Makefile
-gtk-2.0/Makefile
-gtk-3.0/Makefile
-themes/b5/Makefile
-themes/b5/gtk-2.0/Makefile
-themes/b5/gtk-3.0/Makefile
-themes/xfce/gtk-2.0/Makefile
-themes/xfce/gtk-3.0/Makefile
-themes/xfce/Makefile
-themes/xfce-4.0/gtk-2.0/Makefile
-themes/xfce-4.0/gtk-3.0/Makefile
-themes/xfce-4.0/Makefile
-themes/xfce-4.2/gtk-2.0/Makefile
-themes/xfce-4.2/gtk-3.0/Makefile
-themes/xfce-4.2/Makefile
-themes/xfce-4.4/Makefile
-themes/xfce-4.4/gtk-2.0/Makefile
-themes/xfce-4.4/gtk-3.0/Makefile
-themes/xfce-4.6/Makefile
-themes/xfce-4.6/gtk-2.0/Makefile
-themes/xfce-4.6/gtk-3.0/Makefile
-themes/basic/gtk-2.0/Makefile
-themes/basic/gtk-3.0/Makefile
-themes/basic/Makefile
-themes/cadmium/gtk-2.0/Makefile
-themes/cadmium/gtk-3.0/Makefile
-themes/cadmium/Makefile
-themes/curve/gtk-2.0/Makefile
-themes/curve/gtk-3.0/Makefile
-themes/curve/Makefile
-themes/dawn/gtk-2.0/Makefile
-themes/dawn/gtk-3.0/Makefile
-themes/dawn/Makefile
-themes/dusk/gtk-2.0/Makefile
-themes/dusk/gtk-3.0/Makefile
-themes/dusk/Makefile
-themes/kolors/gtk-2.0/Makefile
-themes/kolors/gtk-3.0/Makefile
-themes/kolors/Makefile
-themes/kde2/gtk-2.0/Makefile
-themes/kde2/gtk-3.0/Makefile
-themes/kde2/Makefile
-themes/light/Makefile
-themes/light/gtk-2.0/Makefile
-themes/light/gtk-3.0/Makefile
-themes/orange/gtk-2.0/Makefile
-themes/orange/gtk-3.0/Makefile
-themes/orange/Makefile
-themes/redmondxp/gtk-2.0/Makefile
-themes/redmondxp/gtk-3.0/Makefile
-themes/redmondxp/Makefile
-themes/saltlake/gtk-2.0/Makefile
-themes/saltlake/gtk-3.0/Makefile
-themes/saltlake/Makefile
-themes/smooth/gtk-2.0/Makefile
-themes/smooth/gtk-3.0/Makefile
-themes/smooth/Makefile
-themes/stellar/gtk-2.0/Makefile
-themes/stellar/gtk-3.0/Makefile
-themes/stellar/Makefile
-themes/winter/gtk-2.0/Makefile
-themes/winter/gtk-3.0/Makefile
-themes/winter/Makefile
-themes/Makefile
-])
-
-dnl ***************************
-dnl *** Print configuration ***
-dnl ***************************
-echo
-echo "Build Configuration:"
-echo
-echo "* Gtk 2 Engine: $GTK2_FOUND"
-echo "* Gtk 3 Engine: $GTK3_FOUND"
-echo
-echo "* Install Prefix: $prefix"
-echo "* Debug Support: $enable_debug"
-echo
diff --git a/gtk-2.0/Makefile.am b/gtk-2.0/Makefile.am
index 003ef8d..42cfe67 100644
--- a/gtk-2.0/Makefile.am
+++ b/gtk-2.0/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"gtk-xfce-engine\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/gtk-3.0/Makefile.am b/gtk-3.0/Makefile.am
index e5ca000..b659806 100644
--- a/gtk-3.0/Makefile.am
+++ b/gtk-3.0/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"gtk-xfce-engine\" \
 	$(PLATFORM_CPPFLAGS)
-- 
cgit v1.2.1