From 18e9d6c358b6f5818d8b2aeb2fd18225496e2a4e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Fri, 20 Feb 2009 17:56:54 +0000
Subject: [PATCH] Restore alloca include order

---
 ChangeLog            |  4 ++++
 frontend/scanimage.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bc3150b6..9f36398e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-01  Mattias Ellert <mattias.ellert@fysast.uu.se>
+	* tools/Makefile.am: Add missing liblib dependencies
+	* frontend/scanimage.c: Restore alloca include order
+
 2009-02-19 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
 	* configure.in, Makefile.am, backend/Makefile.am: Have
 	configure define configdir so all makefiles can use
diff --git a/frontend/scanimage.c b/frontend/scanimage.c
index 244737154..717794899 100644
--- a/frontend/scanimage.c
+++ b/frontend/scanimage.c
@@ -22,12 +22,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* Put anything that may use a macro that can conflict with our
- * internal remapping functions in liblib.la before we include
- * include/sane/config.h.
- */
-#include "../include/lalloca.h"	/* MUST come first for AIX! */
+#ifdef _AIX
+# include "../include/lalloca.h"                /* MUST come first for AIX! */
+#endif
+
 #include "../include/sane/config.h"
+#include "../include/lalloca.h"
 
 #include <assert.h>
 #include "lgetopt.h"