diff options
| author | Kalle Wallin <kaw@linux.se> | 2004-03-22 12:43:30 +0000 |
|---|---|---|
| committer | Kalle Wallin <kaw@linux.se> | 2004-03-22 12:43:30 +0000 |
| commit | d15752f082af7e941cc55f5f71ea5cff1a6b4653 (patch) | |
| tree | 5391e54252658231b8921e07643fedbcf568fc7e /configure.ac | |
| parent | 4906ff467fb9c0cccd592ce6c0656e3271444263 (diff) | |
| download | mpd-d15752f082af7e941cc55f5f71ea5cff1a6b4653.tar.gz mpd-d15752f082af7e941cc55f5f71ea5cff1a6b4653.tar.xz mpd-d15752f082af7e941cc55f5f71ea5cff1a6b4653.zip | |
Updated charset support
git-svn-id: https://svn.musicpd.org/ncmpc/trunk@364 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 1d537c6e9..6452834cb 100644 --- a/configure.ac +++ b/configure.ac @@ -17,24 +17,6 @@ dnl ======================================================= set -- $CFLAGS CFLAGS="-Wall $CFLAGS" - - -dnl -dnl Check for libaries -dnl - -dnl ncurses -AC_CHECK_LIB(ncurses, initscr,, [AC_MSG_ERROR(ncurses library is required)]) - -dnl glib-2.0 -AM_PATH_GLIB_2_0(, , [AC_MSG_ERROR(glib-2.x is required)], glib) - -dnl popt -AC_CHECK_LIB(popt, - poptGetArg, - LIBS="$LIBS -lpopt", - AC_MSG_ERROR(Missing popt command line parsing library)) - dnl dnl Check for types dnl @@ -42,24 +24,41 @@ AC_CHECK_TYPE(socklen_t, AC_DEFINE(HAVE_SOCKLEN_T, 1, socklen_t defined in sys/socket.h), ) + dnl dnl Check for headers dnl -AM_ICONV - -AC_CHECK_HEADER(langinfo.h, - AC_DEFINE(HAVE_LANGINFO_H, 1, langinfo.h), +AC_CHECK_HEADER(libgen.h, + AC_DEFINE(HAVE_LIBGEN_H, 1, glibc - libgen.h), ,) AC_CHECK_HEADER(locale.h, - AC_DEFINE(HAVE_LOCALE_H, 1, locale.h), + AC_DEFINE(HAVE_LOCALE_H, 1, locale.h), ,) -AC_CHECK_HEADER(libgen.h, - AC_DEFINE(HAVE_LIBGEN_H, 1, glibc - libgen.h), - ,) +dnl +dnl Check for libaries +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)]) + +dnl glib-2.0 +AM_PATH_GLIB_2_0(, , [AC_MSG_ERROR(glib-2.x is required)], glib) + +dnl popt +AC_CHECK_LIB(popt, + poptGetArg, + LIBS="$LIBS -lpopt", + AC_MSG_ERROR(Missing popt command line parsing library)) dnl dnl X11 @@ -76,6 +75,12 @@ if test "$enable_debug" = yes; then CFLAGS="$CFLAGS -g -DDEBUG" fi +dnl Default charset +AC_ARG_WITH(default-charset, + [ --with-default-charset=ARG Default charset (ISO-8859-1)], + DEFAULT_CHARSET="$withval", + DEFAULT_CHARSET="ISO-8859-1") + dnl Default host AC_ARG_WITH(default-host, [ --with-default-host=HOST Default host (localhost)], @@ -94,9 +99,10 @@ LIBS="$LIBS $GLIB_LIBS -lncurses" 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_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) |