Updated version and added a SYSCONFDIR define to CFLAGS.

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 501e00e88e32f55fa030cb470d0aa2f22ab9fb40..989f9bb0220840a91d725f36dd93e44b222788d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl  $Id: configure.ac,v 1.10 2004/03/18 09:33:43 kalle Exp $
 dnl
 
 AC_INIT(main.c)
-AM_INIT_AUTOMAKE(ncmpc, 0.10.0-svn)
+AM_INIT_AUTOMAKE(ncmpc, 0.10.1)
 
 dnl Check for programs
 AC_PROG_CC
@@ -20,9 +20,14 @@ CFLAGS="-Wall $CFLAGS"
 dnl
 dnl Check for types
 dnl
-AC_CHECK_TYPE(socklen_t, 
-             AC_DEFINE(HAVE_SOCKLEN_T, 1, socklen_t defined in sys/socket.h),
-)
+dnl AC_CHECK_TYPE(socklen_t, 
+dnl          AC_DEFINE(HAVE_SOCKLEN_T, 1, socklen_t defined in sys/socket.h),
+dnl )
+
+AC_SOCKLEN_T
+
+
+
 
 
 dnl
@@ -48,14 +53,9 @@ 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 glib-2.0
 AM_PATH_GLIB_2_0(, , [AC_MSG_ERROR(glib-2.x is required)], glib)
@@ -79,22 +79,6 @@ if test "$enable_debug" = yes; then
   CFLAGS="$CFLAGS -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"
-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)], 
@@ -108,24 +92,23 @@ AC_ARG_WITH(default-port,
             DEFAULT_PORT="2100")
 
 
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$LIBS $GLIB_LIBS -lncurses"
+CFLAGS="$CFLAGS $GLIB_CFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\""
+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)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(doc/Makefile Makefile)
 
 echo "
 Configuration:  
-  Install path:                       ${prefix}
+  prefix:                             ${prefix}
+  sysconfdir:                         ${sysconfdir}
   Enable debugging:                   ${enable_debug}
   Default MPD host:                   ${DEFAULT_HOST}
   Default MPD port:                   ${DEFAULT_PORT}