Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / configure.in

diff --git a/configure.in b/configure.in
index 69f884c43678ba4f42d5692f254501671669a852..105cf5542bc33797f834ba5c071606996a134fd1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,44 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.4)
+AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
 AM_CONFIG_HEADER(config.h)
 
-AC_CANONICAL_HOST
+dnl ---------------
+dnl gettext support
+dnl ---------------
+
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.14.1)
+
+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"
+fi
+
+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 ----------------------
 
 AC_PROG_CC
 AC_ISC_POSIX
@@ -15,7 +49,7 @@ fi
 AC_C_INLINE
 AC_PROG_INSTALL
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h locale.h termios.h linux/termios.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)
@@ -108,7 +142,7 @@ AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging support ], [cas
        esac], [debug=false])
 
 if test x$debug = xtrue; then
-       CPPFLAGS="-DDEBUG $CPPFLAGS"
+       CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
        CFLAGS="-g $CFLAGS"
 fi
 
@@ -116,5 +150,5 @@ if test x$GCC = xyes; then
        CFLAGS="-Wall $CFLAGS"
 fi
 
-AC_OUTPUT(Makefile abook.spec)
+AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)