--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR(m4)
 
 AC_CONFIG_SRCDIR(djmount/djfs.c)
 
-AM_INIT_AUTOMAKE([1.9 -Wall std-options gnu])
+AM_INIT_AUTOMAKE([1.9 -Wall subdir-objects std-options gnu foreign])
 
 AC_CONFIG_HEADERS(config.h)
 
@@ -191,7 +191,8 @@ if test x"$enable_charset" = xyes; then
 	# Checks for function in C library or libiconv 
 	# (AM macros from "gettext" package)
 	AM_ICONV
-	AM_LANGINFO_CODESET
+#	AM_LANGINFO_CODESET
+	AM_GNU_GETTEXT([external])
 	# TBD print warning if no setlocale or nl_langinfo(CODESET) implemented
 fi
 AM_CONDITIONAL(WANT_ICONV,