X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=configure.in;h=105cf5542bc33797f834ba5c071606996a134fd1;hb=69a912c0db0ac135fff332db4f0b05ad9ed2eec6;hp=0ba524c8bd284aa4c6d8a2c7a52dbabe4e28d1c1;hpb=4d2aca39cdd96958b3f0bbc6973f15aac5133cdc;p=pkg%2Fabook.git diff --git a/configure.in b/configure.in index 0ba524c..105cf55 100644 --- a/configure.in +++ b/configure.in @@ -1,15 +1,44 @@ dnl abook configure.in AC_INIT(abook.c) -AM_INIT_AUTOMAKE(abook, 0.5.2pre) +AM_INIT_AUTOMAKE(abook, 0.6.0pre2) AM_CONFIG_HEADER(config.h) -AC_DEFINE(HAVE_SNPRINTF, 0, [Define if snprintf is available.]) -AC_DEFINE(HAVE_VSNPRINTF, 0, [Define if vsnprintf is available.]) -AC_DEFINE(HAVE_STDARG_H, 0, [Define if you have the header file.]) -AC_DEFINE(HAVE_NCURSES, 0, [Define if you have the header file.]) +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) -AC_CANONICAL_HOST +dnl ---------------------- +dnl end of gettext support +dnl ---------------------- AC_PROG_CC AC_ISC_POSIX @@ -20,14 +49,18 @@ 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_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H),AC_MSG_ERROR([*** stdarg.h is missing on your system ***])) +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 header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***])) AC_FUNC_STRCOLL AC_CHECK_FUNCS(setlocale) ac_widec_funcs=yes -AC_CHECK_HEADER(wchar.h,[ac_have_wchar_h=yes], [ac_have_wchar_h=no]) -AC_CHECK_FUNCS(mbtowc wcwidth,,ac_widec_funcs=no) +AC_CHECK_HEADER(wchar.h,[ + ac_have_wchar_h=yes + AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the header file.])], + [ac_have_wchar_h=no]) +AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no) +AC_CHECK_DECLS(wcwidth) AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no) if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then @@ -36,16 +69,6 @@ else ac_widec_possible=no fi -AC_ARG_ENABLE(widec, [ --enable-widec Enable wide character support (experimental) ], [case "${enableval}" in - yes) ac_widec_support=true ;; - no) ac_widec_support=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-widec) ;; - esac], [ac_widec_support=false]) - -if test x$ac_widec_support = xtrue -a x$ac_widec_possible != xyes; then - AC_MSG_ERROR(Wide character support is not possible due to missing wide character functions or wchar.h) -fi - dnl ------------------- dnl (n)curses detection dnl ------------------- @@ -60,15 +83,13 @@ AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ], CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include" fi]) -if test x$ac_widec_support = xtrue; then - AC_CHECK_LIB(ncursesw, initscr, - [LIBS="$LIBS -lncursesw" - if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" - fi - AC_CHECK_HEADERS(ncurses.h)],[ - AC_MSG_ERROR("Wide character support is not possible due to missing ncursesw library. Please install it or disable wide character support")]) -else +AC_CHECK_LIB(ncursesw, initscr, + [LIBS="$LIBS -lncursesw" + if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then + CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" + fi + AC_CHECK_HEADERS(ncurses.h)],[ + ac_widec_possible=no AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses" if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then @@ -76,7 +97,7 @@ else fi AC_CHECK_HEADERS(ncurses.h)], [CF_CURSES_LIBS]) -fi + ]) dnl -------------------------- dnl end of (n)curses detection @@ -106,14 +127,13 @@ dnl ------------------------- dnl end of readline detection dnl ------------------------- -if test x$ac_widec_support = xtrue; then +if test x$ac_widec_possible = xyes; then AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters]) fi AC_CHECK_FUNCS(resizeterm) -AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],) -AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF)],) +AC_CHECK_FUNCS(snprintf vsnprintf) AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in yes) debug=true ;; @@ -122,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 @@ -130,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)