Index: gbatnav-1.0.4cvs20051004/configure.in
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/configure.in	2002-04-19 10:28:51.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/configure.in	2011-09-17 22:39:32.180752546 +0800
@@ -3,8 +3,7 @@
 AC_PREREQ(2.12)
 AM_INIT_AUTOMAKE(gbatnav, 1.0.5pre)
 AM_MAINTAINER_MODE
-AM_ACLOCAL_INCLUDE(macros)
-GNOME_INIT
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
 AC_PROG_LN_S
@@ -13,17 +12,16 @@
 AC_HEADER_STDC
 AC_ARG_PROGRAM
 
-dnl GNOME_COMPILE_WARNINGS
+PKG_CHECK_MODULES(GNOME,[libgnomeui-2.0])
+AC_SUBST(GNOME_CFLAGS)
+AC_SUBST(GNOME_LIBS)
 
-GNOME_X_CHECKS
-
-ALL_LINGUAS="es de pl ja ru fr"
+ALL_LINGUAS="es de pl ja ru fr sv"
 AM_GNU_GETTEXT
 
 
 dnl DATADIRNAME is generated by AM_GNU_GETTEXT; 
 dnl note this has to match the path installed by po/Makefile
-FC_EXPAND_DIR(LOCALEDIR, '${prefix}/${DATADIRNAME}/locale')
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 
 dnl
@@ -38,10 +36,10 @@
 AM_CONDITIONAL(GGZSUPPORT, test "x$enable_ggz" = "xyes" )
 if test "x$enable_ggz" = "xyes"; then
 	AC_DEFINE(WITH_GGZ)
-	AC_GGZ_GGZDMOD
-	AC_GGZ_GGZMOD
-	AC_GGZ_CONFIG
-	AC_GGZ_SERVER
+	AC_SUBST(GGZMOD_INCLUDES)
+	AC_SUBST(GGZMOD_LDFLAGS)
+	AC_SUBST(GGZDMOD_INCLUDES)
+	AC_SUBST(GGZDMOD_LDFLAGS)
 fi
 
 
