From 84ddcd15cab7dc38bfad90348668c1bd5dc727f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Droz?= <raphael.droz+floss@gmail.com>
Date: Sun, 20 Jan 2013 17:54:28 +0100
Subject: [PATCH] autotools update: 1/2: main files * run autoupdate on
 configure.in * renamed configure{.in => .ac} * unbundle libintl:
 AM_GNU_GETTEXT([external]) * added a couple of files to .gitignore

---
 .gitignore                   |  2 ++
 Makefile.am                  |  2 +-
 configure.in => configure.ac | 12 +++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename configure.in => configure.ac (96%)

diff --git a/.gitignore b/.gitignore
index cdedb40..1419d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,12 @@ abook.spec
 config.h
 config.log
 config.status
+config.cache
 intl/Makefile
 po/Makefile
 po/Makefile.in
 po/POTFILES
+po/*.gmo
 stamp-h1
 *.o
 *~
diff --git a/Makefile.am b/Makefile.am
index 912ad97..8faaa11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ uninstall-local:
 	-rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
 
 
-SUBDIRS = intl po
+SUBDIRS = po
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.in b/configure.ac
similarity index 96%
rename from configure.in
rename to configure.ac
index 7ac1006..bfe8e7e 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,15 +1,16 @@
 dnl abook configure.in
 
-AC_INIT(abook.c)
+AC_INIT
+AC_CONFIG_SRCDIR([abook.c])
 AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
 
 dnl ---------------
 dnl gettext support
 dnl ---------------
 
 AC_USE_SYSTEM_EXTENSIONS
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18.1])
 
 AC_DEFUN([ABOOK_EXPAND_PREFIX], [
@@ -42,7 +43,7 @@ dnl end of gettext support
 dnl ----------------------
 
 AC_PROG_CC
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 AM_C_PROTOTYPES
 if test "x$U" != "x"; then
 	AC_MSG_ERROR(Compiler not ANSI compliant)
@@ -178,4 +179,5 @@ if test x$GCC = xyes; then
 	CFLAGS="-Wall $CFLAGS"
 fi
 
-AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)
+AC_CONFIG_FILES([Makefile abook.spec po/Makefile.in])
+AC_OUTPUT
-- 
2.39.2