Bug#598226: FTBFS when configure is rebuild

[Goswin von Brederlow]

Package: freeciv
Version: 2.2.2-1
Severity: important
Tags: patch

Hi,

the debian/patches/use_system_lua5.1 patch is broken:

--- freeciv-2.2.1.orig/configure.ac
+++ freeciv-2.2.1/configure.ac
@@ -851,8 +851,8 @@ AC_CHECK_FUNCS([isatty popen _longjmp])
 dnl In the future we probably get rid of our own lua tree and use
 dnl lua from system.
 dnl LUA_AS_DEPENDENCY should be empty when using lua outside own our tree.
-LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.1/src"
-LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.a"
+LUA_CFLAGS := $(shell pkg-config lua5.1 --cflags)
+LUA_LIBS="/usr/lib/liblua5.1.a"
 LUA_AS_DEPENDENCY="$LUA_LIBS"
 AC_SUBST([LUA_CFLAGS])
 AC_SUBST([LUA_LIBS])
--- freeciv-2.2.1.orig/configure
+++ freeciv-2.2.1/configure
@@ -29522,8 +29522,8 @@ fi
 done
 
 
-LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.1/src"
-LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.a"
+LUA_CFLAGS="\$(shell pkg-config lua5.1 --cflags)"
+LUA_LIBS="/usr/lib/liblua5.1.a"
 LUA_AS_DEPENDENCY="$LUA_LIBS"


Notice how the LUA_CFLAGS in the two files differ? If anything
triggers a rebuild of configure the working chunk in the configure
file is replaced by the broken chunk from configure.ac and then the
build fails with:

/bin/sh ../../libtool --preserve-dup-deps --tag=CC   --mode=compile x86_64-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../../../server/scripting -I../..  -I../../../utility -I../../../common -I../../../server  -I../../../dependencies/tolua-5.1/include -DLOCALEDIR="\"/usr/share/locale\"" -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/share/games/freeciv\""  -Wall -g -O2  -MT api_gen.lo -MD -MP -MF .deps/api_gen.Tpo -c -o api_gen.lo ../../../server/scripting/api_gen.c
libtool: compile:  x86_64-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../../../server/scripting -I../.. -I../../../utility -I../../../common -I../../../server -I../../../dependencies/tolua-5.1/include -DLOCALEDIR=\"/usr/share/locale\" "-DDEFAULT_DATA_PATH=\".:data:~/.freeciv:/usr/share/games/freeciv\"" -Wall -g -O2 -MT api_gen.lo -MD -MP -MF .deps/api_gen.Tpo -c ../../../server/scripting/api_gen.c -o api_gen.o
In file included from ../../../server/scripting/api_gen.c:6:
.../../../dependencies/tolua-5.1/include/tolua.h:33:17: error: lua.h: No such file or directory
.../../../dependencies/tolua-5.1/include/tolua.h:34:21: error: lauxlib.h: No such file or directory

The "-I /usr/include/lua5.1" is now missing.

MfG
	Goswin

PS: Please consider asking for a freeze exception for this. The
problem might occur if there has to be a security fix for freeciv and
then the security team has to figure it all out again.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31.5-book-1 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash