X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=configure.in;h=105cf5542bc33797f834ba5c071606996a134fd1;hb=69a912c0db0ac135fff332db4f0b05ad9ed2eec6;hp=34e93035dd9307f6760488ac19f12cc25a73921f;hpb=4b8f9231090ada43f7e16987ec46ac7f45a914ec;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index 34e9303..105cf55 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.5pre1)
+AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------
@@ -11,17 +11,31 @@ dnl ---------------
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION(0.14.1)
 
-localedir="$ac_default_prefix/share/locale"
+AC_DEFUN([ABOOK_EXPAND_PREFIX], [
+	$1=$2
+	dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
+	dnl $datarootdir which in turn refers to $prefix
+	$1=`(	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+		eval tmp_abook_prefix=\""[$]$1"\"
+		eval echo $tmp_abook_prefix
+		)`
+])
+
+ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
+localedir="\$(datadir)/locale"
+
 AC_ARG_WITH(localedir,
 	[  --with-localedir=PATH      Where the locale files are installed ])
 if test "x$with_localedir" != "x"; then
+	abook_localedir="$with_localedir"
 	localedir="$with_localedir"
-elif test "x${prefix}" != "xNONE"; then
-	localedir="$prefix/share/locale"
 fi
-AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir", [locale directory])
+
+AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
 AC_SUBST(localedir)
 
+AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
+
 dnl ----------------------
 dnl end of gettext support
 dnl ----------------------
@@ -35,7 +49,7 @@ fi
 AC_C_INLINE
 AC_PROG_INSTALL
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h)
+AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h iconv.h)
 AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H, 1, [Define if you have the <stdarg.h> header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
 AC_FUNC_STRCOLL
 AC_CHECK_FUNCS(setlocale)