X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=0e6957f822ca5d486a5d14a88b46bf872f90474f;hb=4ee5802aa8a6edc3f339ee283782fcc4e486c933;hp=9494b026e583f4ffb68337092844cc3e807a36ac;hpb=f13b6fcc05df549a49469caf972760c68c7203b6;p=ncmpc.git

diff --git a/configure.ac b/configure.ac
index 9494b02..0e6957f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([ncmpc], [0.11.1-svn])
+AM_INIT_AUTOMAKE([ncmpc], [0.11.2-svn])
 AM_CONFIG_HEADER([config.h])
 
 dnl Check for programs
@@ -17,7 +17,7 @@ dnl initialize variables
 dnl =======================================================
 
 dnl i18n
-ALL_LINGUAS="es de ru sv"
+ALL_LINGUAS="es de fr gl no ru sv"
 
 set -- $CFLAGS
 
@@ -51,11 +51,48 @@ dnl
 dnl Check for libraries
 dnl
 
+dnl Try to find the socket functions
+AC_CHECK_FUNC([socket],
+	      [], 
+              [AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"],
+	                    [AC_MSG_ERROR(No UNIX socket API found)])
+              ])
+
+dnl Try to find the gethostbyname functions
+AC_CHECK_FUNC([gethostbyname],
+	      [], 
+              [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
+	                    [AC_MSG_ERROR(No UNIX gethostbyname API found)])
+              ])
+
+
 dnl ncurses
-AC_CHECK_LIB([ncurses], 
+ncurses=auto
+AC_ARG_WITH([ncurses],
+	    AC_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
+	    [ncurses=ncurses])
+AC_ARG_WITH(ncursesw,
+	    AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
+	    [ncurses=ncursesw])
+
+if test "x$ncurses" = "xauto"; then
+	AC_CHECK_LIB([ncursesw], 
+		     [initscr],
+		     [ncurses=ncursesw],
+		     [ncurses=ncurses])
+fi
+		     
+
+AC_CHECK_LIB([$ncurses], 
 	     [initscr],
-             [LIBS="$LIBS -lncurses"], 
-             [AC_MSG_ERROR(ncurses library is required)])
+	     [LIBS="$LIBS -l$ncurses"], 
+	     [AC_MSG_ERROR($ncurses library is required)])
+
+
+if test "x$ncurses" = "xncursesw" ; then
+   AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [wide-char wget_ch()])
+   AC_DEFINE(USE_NCURSESW, 1, [use wide-char ncurses library])
+fi
 
 
 dnl Check for glib-2.4
@@ -153,17 +190,29 @@ AC_ARG_ENABLE([mouse],
 	      [getmouse=yes])
 AC_MSG_RESULT([$getmouse])
 if test "x$getmouse" = "xyes" ; then
-   AC_CHECK_LIB([ncurses], 
+   AC_CHECK_LIB([$ncurses], 
 	        [getmouse],
-		[AC_DEFINE([HAVE_GETMOUSE], [1], [ncurses - getmouse()])],
+		[AC_DEFINE([HAVE_GETMOUSE], [1], [$ncurses - getmouse()])],
 		[])
 fi
 
-dnl search screen
+dnl Optional screen - artist
+AC_MSG_CHECKING([whether to include the artist screen])
+AC_ARG_ENABLE([artist-screen], 
+              AC_HELP_STRING([--enable-artist-screen],
+	                     [Enable artist screen (EXPERIMENTAL) @<:@default=no@:>@]),
+	      [artist_screen="$enableval"],
+	      [artist_screen=no])
+AC_MSG_RESULT([$artist_screen])
+if test "x$artist_screen" != "xyes" ; then
+   AC_DEFINE(DISABLE_ARTIST_SCREEN, 1, [Disable artist screen])
+fi
+
+dnl Optional screen - search
 AC_MSG_CHECKING([whether to include the search screen])
 AC_ARG_ENABLE([search-screen], 
               AC_HELP_STRING([--enable-search-screen],
-	                     [Enable search screen @<:@default=yes@:>@]),
+	                     [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),
 	      [search_screen="$enableval"],
 	      [search_screen=yes])
 AC_MSG_RESULT([$search_screen])
@@ -187,9 +236,9 @@ dnl Optional screen - clock
 AC_MSG_CHECKING([whether to include the clock screen])
 AC_ARG_ENABLE([clock-screen], 
               AC_HELP_STRING([--enable-clock-screen],
-	                     [Enable clock screen @<:@default=no@:>@]),
+	                     [Enable clock screen @<:@default=yes@:>@]),
 	      [clock_screen="$enableval"],
-	      [clock_screen=no])
+	      [clock_screen=yes])
 AC_MSG_RESULT([$clock_screen])
 if test "x$clock_screen" != "xyes" ; then
    AC_DEFINE(DISABLE_CLOCK_SCREEN, 1, [Disable clock screen])
@@ -216,6 +265,15 @@ AC_MSG_RESULT([$DEFAULT_PORT])
 AC_DEFINE_UNQUOTED([DEFAULT_PORT],     [$DEFAULT_PORT],   [Default MPD port])
 AC_DEFINE_UNQUOTED([DEFAULT_PORT_STR], ["$DEFAULT_PORT"], [Default MPD port])
 
+dnl Default timedisplay type
+AC_MSG_CHECKING([for default timedisplay type])
+AC_ARG_WITH([default-timedisplay_type],
+	    AC_HELP_STRING([--with-default-timedisplay_type=ARG],
+	                   [default_timedisplay]),
+            [DEFAULT_TIMEDISPLAY_TYPE="$withval"],
+            [DEFAULT_TIMEDISPLAY_TYPE="elapsed"])
+AC_MSG_RESULT([$DEFAULT_TIMEDISPLAY_TYPE])
+AC_DEFINE_UNQUOTED([DEFAULT_TIMEDISPLAY_TYPE], ["$DEFAULT_TIMEDISPLAY_TYPE"], [Default way to display time, either 'elapsed' or 'remaining'])
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in])
 AC_OUTPUT