From 659a2c86ae161d84567b0b10ae254097290b3048 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 22 Aug 2006 15:44:21 +0200
Subject: [PATCH] Use autoconf.

---
 .bzrignore           | 10 ++++++++++
 ChangeLog            |  3 +++
 Makefile             | 18 ++++++++----------
 Makefile.settings.in |  5 +++++
 configure.ac         | 11 +++++++++++
 5 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 Makefile.settings.in
 create mode 100644 configure.ac

diff --git a/.bzrignore b/.bzrignore
index f63c316..5dd17bd 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,13 @@
 at89prog
 at89prog-gtk
 debian/tmp
+aclocal.m4
+autom4te.cache
+config.status
+config.log
+configure
+Makefile.settings
+at89prog.aux
+at89prog.log
+at89prog.pdf
+at89prog.toc
diff --git a/ChangeLog b/ChangeLog
index d207abf..b9cee13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.9:
+ * Use autoconf.
+
 0.8:
  * Fix major bug in hex parsing code
  * Detect EOF correctly in Intel hex files
diff --git a/Makefile b/Makefile
index 7d41ef6..3cf849c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,18 @@
-LIBS = -lpopt 
-DEBUG = -g3 #-pg -fprofile-arcs
-GTK_LIBS = `pkg-config --libs gtk+-2.0 glib-2.0 gtkhex`
-GTK_CFLAGS = `pkg-config --cflags gtk+-2.0 glib-2.0 gtkhex`
-#DEBUG = 
+include Makefile.settings
 
 COMMON_OBJ = at89ser.o pins.o pins-serial.o pins-serial-raw.o delays.o pins-parallel.o hexfile.o
 PROG_OBJ = at89prog.o $(COMMON_OBJ)
 GTKPROG_OBJ = at89prog-gtk.o $(COMMON_OBJ)
 
-all: at89prog check-gtk
+all: at89prog $(EXTRA_TARGETS)
 doc: at89prog.pdf
 
+Makefile.settings: Makefile.settings.in configure
+	./configure
+
+configure: configure.ac
+	autoreconf
+
 install: all doc
 	mkdir -p $(DESTDIR)/usr/bin
 	cp at89prog $(DESTDIR)/usr/bin
@@ -26,10 +28,6 @@ at89prog.pdf: at89prog.tex
 at89prog: $(PROG_OBJ)
 	$(CC) $(DEBUG) -Wall -O -o $@ $(PROG_OBJ) $(LIBS)
 
-# Only build Gtk version if GTK and GLib were found
-check-gtk:
-	-pkg-config --exists gtk+-2.0 glib-2.0 gtkhex 2>/dev/null > /dev/null && $(MAKE) at89prog-gtk
-
 at89prog-gtk: $(GTKPROG_OBJ)
 	$(CC) $(DEBUG) -Wall -O -o $@ $(GTKPROG_OBJ) $(LIBS) $(GTK_LIBS)
 
diff --git a/Makefile.settings.in b/Makefile.settings.in
new file mode 100644
index 0000000..c888c48
--- /dev/null
+++ b/Makefile.settings.in
@@ -0,0 +1,5 @@
+LIBS = -lpopt 
+CFLAGS = @CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+CC = @CC@
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..81dd489
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,11 @@
+AC_INIT(at89prog, 0.9, [jelmer@vernstok.nl])
+
+AC_PROG_CC
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 glib-2.0 gtkhex, EXTRA_TARGETS="at89prog-gtk", 
+				  echo -n)
+
+AC_SUBST(EXTRA_TARGETS)
+
+AC_CONFIG_FILES([Makefile.settings])
+AC_OUTPUT
-- 
2.34.1