diff --git a/configure.ac b/configure.ac
index 501e00e88e32f55fa030cb470d0aa2f22ab9fb40..20cc143af3f5a4f0bca615e251b2655a775228c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl
-dnl $Id: configure.ac,v 1.10 2004/03/18 09:33:43 kalle Exp $
+dnl $Id$
dnl
-AC_INIT(main.c)
-AM_INIT_AUTOMAKE(ncmpc, 0.10.0-svn)
+AC_INIT
+AC_CONFIG_SRCDIR([src/main.c])
+AM_INIT_AUTOMAKE(ncmpc, 0.11.0-svn)
+AM_CONFIG_HEADER([config.h])
dnl Check for programs
AC_PROG_CC
dnl =======================================================
set -- $CFLAGS
-CFLAGS="-Wall $CFLAGS"
+
+keydef_screen=yes
dnl
dnl Check for types
dnl
-AC_CHECK_TYPE(socklen_t,
- AC_DEFINE(HAVE_SOCKLEN_T, 1, socklen_t defined in sys/socket.h),
-)
+
+AC_SOCKLEN_T
dnl
dnl Check for libraries
dnl
-dnl iconv
-AM_ICONV
-
-dnl nl_langinfo()
-AM_LANGINFO_CODESET
-
dnl ncurses
AC_CHECK_LIB(ncurses, initscr,, [AC_MSG_ERROR(ncurses library is required)])
+LIBS="$LIBS -lncurses"
+
+dnl Check for glib-2
+#AM_PATH_GLIB_2_0(, , [AC_MSG_ERROR(glib-2.x is required)], glib)
+PKG_CHECK_MODULES(GLIB,
+ glib-2.0 >= 2.2,
+ ,
+ AC_MSG_ERROR(glib-2.2 is required))
+
+dnl i18n
+ALL_LINGUAS=""
+AC_MSG_CHECKING([whether to include NLS support])
+AC_ARG_ENABLE([nls],
+ AC_HELP_STRING([--enable-nls],
+ [include natural language support @<:@default=yes@:>@]),
+ [nls="$enableval"],
+ [nls=yes])
+AC_MSG_RESULT([$nls])
+if test "x$nls" = "xyes"; then
+ ALL_LINGUAS="sv"
+ AM_GLIB_GNU_GETTEXT
+ GETTEXT_PACKAGE=$PACKAGE
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
+ ["${GETTEXT_PACKAGE}"],
+ [gettext domain])
+ nls=$gt_cv_have_gettext
+fi
-dnl glib-2.0
-AM_PATH_GLIB_2_0(, , [AC_MSG_ERROR(glib-2.x is required)], glib)
dnl popt
AC_CHECK_LIB(popt,
dnl Debugging
AC_ARG_ENABLE(debug,
- [ --enable-debug Enable debugging [default=no]],
+ AC_HELP_STRING(--enable-debug,Enable debugging (default=no)),
,
enable_debug=no)
if test "$enable_debug" = yes; then
- CFLAGS="$CFLAGS -g -DDEBUG"
+ CFLAGS="$CFLAGS -Wall -g -DDEBUG"
fi
-dnl Enable
-AC_ARG_ENABLE(colors,
- [ --enable-colors Enable colors [default=no]],
- ,
- enable_colors=no)
-
-if test "$enable_colors" = yes; then
- CFLAGS="$CFLAGS -DENABLE_COLORS"
+dnl Key editor
+AC_ARG_ENABLE(key-editor,
+ AC_HELP_STRING(--enable-key-editor,
+ Enable key editor (default=yes)),
+ keydef_screen=no,
+ keydef_screen=yes)
+if test "$keydef_screen" = yes; then
+ AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable builtin key editor])
fi
-dnl Default charset
-AC_ARG_WITH(default-charset,
- [ --with-default-charset=ARG Default charset (ISO-8859-1)],
- DEFAULT_CHARSET="ISO-8859-1")
dnl Default host
AC_ARG_WITH(default-host,
- [ --with-default-host=HOST Default host (localhost)],
+ AC_HELP_STRING(--with-default-host=ARG,Default MPD host (localhost)),
DEFAULT_HOST="$withval",
DEFAULT_HOST="localhost")
dnl Default port
AC_ARG_WITH(default-port,
- [ --with-default-port=PORT Default port (2100)],
+ AC_HELP_STRING(--with-default-port=ARG,Default port (6600)),
DEFAULT_PORT="$withval",
- DEFAULT_PORT="2100")
-
-
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$LIBS $GLIB_LIBS -lncurses"
+ DEFAULT_PORT="6600")
dnl Autoheader
AC_DEFINE_UNQUOTED(DEFAULT_PORT, $DEFAULT_PORT, Default MPD port)
AC_DEFINE_UNQUOTED(DEFAULT_PORT_STR, "$DEFAULT_PORT", Default MPD port)
AC_DEFINE_UNQUOTED(DEFAULT_HOST, "$DEFAULT_HOST", Default MPD host)
-AC_DEFINE_UNQUOTED(DEFAULT_CHARSET, "$DEFAULT_CHARSET", Default charset)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in])
+AC_OUTPUT
echo "
Configuration:
- Install path: ${prefix}
- Enable debugging: ${enable_debug}
+ prefix: ${prefix}
+ nls: ${nls}
+ sysconfdir: ${sysconfdir}
Default MPD host: ${DEFAULT_HOST}
Default MPD port: ${DEFAULT_PORT}
+ Enable debugging: ${enable_debug}
+ Key edit screen: ${keydef_screen}
"
echo