From: Kalle Wallin <kaw@linux.se>
Date: Mon, 29 Mar 2004 18:12:30 +0000 (+0000)
Subject: Removed --with-default-charset option.
X-Git-Tag: v0.12_alpha1~624
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d50527814b026149f7c7dfc6b95ea5a54a5cc771;p=ncmpc.git

Removed --with-default-charset option.


git-svn-id: https://svn.musicpd.org/ncmpc/trunk@537 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---

diff --git a/configure.ac b/configure.ac
index d11ba0f..912767e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ dnl
 
 dnl ncurses
 AC_CHECK_LIB(ncurses, initscr,, [AC_MSG_ERROR(ncurses library is required)])
+LIBS="$LIBS -lncurses"
 
 dnl glib-2.0
 AM_PATH_GLIB_2_0(, , [AC_MSG_ERROR(glib-2.x is required)], glib)
@@ -73,11 +74,6 @@ 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="ISO-8859-1")
-
 dnl Default host
 AC_ARG_WITH(default-host,
 	    [  --with-default-host=HOST  Default host (localhost)], 
@@ -92,14 +88,13 @@ AC_ARG_WITH(default-port,
 
 
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$LIBS $GLIB_LIBS -lncurses"
+LIBS="$LIBS $GLIB_LIBS"
 
 
 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)