From d9ec4cfedc5d542c7389cad31b33613de3882fd4 Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Wed, 1 Jun 2011 15:32:49 -0400
Subject: some further automake magic for dual versioning

---
 configure.ac        |  6 +++---
 example/Makefile.am | 10 ++++++++--
 src/idotimeline.c   |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index fc26c5b..4dfe223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_CONFIG_MACRO_DIR([build/autotools])
 
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([1.9 foreign])
 
 IDO_MAJOR_VERSION=ido_major_version
 IDO_MINOR_VERSION=ido_minor_version
@@ -52,9 +52,11 @@ dnl ===========================================================================
 
 # Checks for programs
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
+PKG_PROG_PKG_CONFIG
 
 # Checks for header files
 AC_HEADER_STDC
@@ -68,8 +70,6 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
-PKG_PROG_PKG_CONFIG
-
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
     [Which version of gtk to use @<:@default=3@:>@])],
diff --git a/example/Makefile.am b/example/Makefile.am
index 7e76434..b986b9b 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,3 +1,9 @@
+if USE_GTK3
+VER=3
+else
+VER=
+endif
+
 noinst_PROGRAMS =               \
 	messagedialog		\
         menus
@@ -24,6 +30,6 @@ menus_CPPFLAGS =                \
         $(GTK_CFLAGS)           \
         $(MAINTAINER_CFLAGS)
 
-messagedialog_LDADD = $(top_builddir)/src/libido-0.1.la $(GTK_LIBS)
+messagedialog_LDADD = $(top_builddir)/src/libido$(VER)-0.1.la $(GTK_LIBS)
 
-menus_LDADD = $(top_builddir)/src/libido-0.1.la $(GTK_LIBS)
+menus_LDADD = $(top_builddir)/src/libido$(VER)-0.1.la $(GTK_LIBS)
diff --git a/src/idotimeline.c b/src/idotimeline.c
index a9ca0c6..479fa09 100644
--- a/src/idotimeline.c
+++ b/src/idotimeline.c
@@ -22,7 +22,7 @@
 #include "idotimeline.h"
 #include "idotypebuiltins.h"
 
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 #include <math.h>
 
 #define IDO_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IDO_TYPE_TIMELINE, IdoTimelinePriv))
-- 
cgit v1.2.3