X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=d9748b9472de4e567e0b1712ad2df4ff6a25cb25;hb=20cd751db12c400c98533c1b98fa984a9aecf9db;hp=83a47a7d11311d22917fa71630afb61bbd66df11;hpb=88af2c3ace0fa42dbb816cc9fe8c4b54ce89233a;p=ncmpc.git

diff --git a/configure.ac b/configure.ac
index 83a47a7..d9748b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,50 +1,47 @@
-dnl
-dnl  $Id$
-dnl
-
-AC_INIT(ncurses MPD client, 0.12~git, max@duempel.org, ncmpc)
+AC_PREREQ(2.60)
+AC_INIT(ncurses MPD client, 0.13~git, max@duempel.org, ncmpc)
 AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([gnu 1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl Check for programs
 AC_PROG_CC_C99
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 
 dnl =======================================================
 dnl initialize variables
 dnl =======================================================
 
 dnl i18n
-ALL_LINGUAS="es da de fr gl no ru sv"
+ALL_LINGUAS="es da de fr gl no ru sk sv hu"
 
 set -- $CFLAGS
 
-dnl
-dnl Check for types
-dnl
-
-AC_MSG_RESULT([$ac_have_socklen_t]) 
 
 dnl
-dnl Check for headers
+dnl ncmpc-mini
 dnl
 
-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]),
-		,)
-
-
-dnl
-dnl Check for functions
-dnl
-AC_CHECK_FUNCS([strcasestr])
+AC_ARG_ENABLE(mini,
+    AS_HELP_STRING([--enable-mini],
+		[Build ncmpc-mini, i.e. without all optional features (default: disabled)]),
+    [enable_mini=$enableval],
+    [enable_mini=no])
+
+AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
+if test "x$enable_mini" = xyes; then
+    AC_DEFINE([NCMPC_MINI], [1], [Build ncmpc-mini, which disables lots of features])
+    auto=no
+    disable_mini=no
+    auto_mini=no
+    ncurses=ncurses
+else
+    auto=auto
+    disable_mini=yes
+    auto_mini=auto
+    ncurses=auto
+fi
 
 
 dnl
@@ -66,8 +63,15 @@ AC_CHECK_FUNC([gethostbyname],
               ])
 
 
+dnl wide character support
+AC_ARG_ENABLE([wide],
+    AC_HELP_STRING([--enable-wide],
+                   [Enable wide character support]),
+                   [enable_wide=$enableval],
+                   [enable_wide=auto])
+
+
 dnl ncurses
-ncurses=auto
 AC_ARG_WITH([ncurses],
 	    AC_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
 	    [ncurses=ncurses])
@@ -75,6 +79,17 @@ AC_ARG_WITH(ncursesw,
 	    AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
 	    [ncurses=ncursesw])
 
+if test "x$enable_wide" = "xno"; then
+    if test "x$ncurses" = "xauto"; then
+        dnl select narrow ncurses
+        ncurses=ncurses
+    fi
+
+    if test "x$ncurses" = "xncursesw"; then
+        AC_MSG_WARN([Narrow ncmpc linking against wide libncurses])
+    fi
+fi
+
 if test "x$ncurses" = "xauto"; then
 	AC_CHECK_LIB([ncursesw], 
 		     [initscr],
@@ -87,109 +102,135 @@ AC_CHECK_LIB([$ncurses],
 	     [LIBS="$LIBS -l$ncurses"], 
 	     [AC_MSG_ERROR($ncurses library is required)])
 
+if test "x$ncurses" = "xncursesw"; then
+    AC_CHECK_HEADER([ncursesw/ncurses.h],
+                    AC_DEFINE([HAVE_NCURSESW_NCURSES_H], [1], [ncursesw/ncurses.h]),
+                    ,)
+fi
 
 
-dnl Check for glib-2.4
-PKG_CHECK_MODULES([GLIB], 
-		  [glib-2.0 >= 2.4],
-		  [glib24=yes],
-		  [AC_MSG_WARN([glib-2.4 is required for NLS support!])])
-if test "x$glib24" != "xyes"; then
-   PKG_CHECK_MODULES([GLIB], 
-		     [glib-2.0 >= 2.2],
-		     [nls=no],
-		     [AC_MSG_ERROR([glib-2.2 is required])])
+dnl wide character support II
+
+if test "x$enable_wide" = "xauto" ; then
+    AC_CHECK_LIB([$ncurses], 
+	         [wget_wch],
+	         [enable_wide=yes],
+	         [enable_wide=no])
+fi
+
+AC_MSG_CHECKING([wide character support])
+AC_MSG_RESULT([$enable_wide])
+
+if test "x$enable_wide" = "xyes" ; then
+    AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support])
 fi
 
+dnl multi-byte character support
+
+AC_ARG_ENABLE([multibyte],
+	AC_HELP_STRING([--disable-multibyte],
+		[Disable multibyte character support (default: enabled)]),
+		[enable_multibyte=$enableval],
+		[enable_multibyte=$disable_mini])
+
+if test x$enable_multibyte = xyes; then
+	AC_DEFINE([ENABLE_MULTIBYTE], [1], [Enable multibyte character support])
+else
+	if test x$enable_wide = xyes; then
+		AC_MSG_WARN(wide characters without multibyte characters makes little sense)
+	fi
+fi
+
+dnl Check for glib-2.4
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
+	[AC_MSG_ERROR([glib-2.2 is required])])
+
 
 dnl i18n
-AM_NLS
-if test "x$glib24" = "xyes"; then
-  nls=$USE_NLS
+
+AC_ARG_ENABLE([locale],
+	AC_HELP_STRING([--disable-locale],
+		[Disable locale support (default: auto)]),
+		[enable_locale=$enableval],
+		[enable_locale=$auto_mini])
+
+if test x$enable_locale = xyes; then
+	AC_CHECK_HEADER([locale.h],,
+		[AC_MSG_ERROR(locale.h is unavailable)])
+fi
+
+if test x$enable_locale = xauto; then
+	AC_CHECK_HEADER([locale.h],
+		[enable_locale=yes],
+		[enable_locale=no])
+fi
+
+if test x$enable_locale = xyes; then
+	AC_DEFINE([ENABLE_LOCALE], [1], [Locale support is enabled])
+fi
+
+if test x$enable_mini != xyes; then
+	AM_NLS
 else
-  USE_NLS=no
-  AC_SUBST(USE_NLS)
+	USE_NLS=no
 fi
 
-if test "x$nls" = "xyes"; then
+if test x$USE_NLS = xyes; then
    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
-  if test "x$nls" != "xyes"; then
+	USE_NLS=$gt_cv_have_gettext
+	if test x$USE_NLS != xyes; then
      AC_MSG_WARN([NLS support disabled!])
   fi
 else
   AM_PO_SUBDIRS
 fi
 
-dnl disbale raw mode
-AC_MSG_CHECKING([Place the terminal into raw mode])
-AC_ARG_ENABLE([raw-mode],
-	AC_HELP_STRING([--disable-raw-mode],
-		       [Disable raw terminal mode]),
-		       [use_raw=$enableval], 
-                       [use_raw=yes])
-AC_MSG_RESULT([$use_raw])
-if test "x$use_raw" = "xyes" ; then
-  AC_DEFINE([ENABLE_RAW_MODE], [1], [Place the terminal into raw mode])
-fi
-
 dnl enable colors
 AC_MSG_CHECKING([color support])
 AC_ARG_ENABLE([colors],
 	AC_HELP_STRING([--enable-colors],
 		       [Enable color support]),
 		       [use_colors=$enableval], 
-                       [use_colors=no])
+	[use_colors=$disable_mini])
 AC_MSG_RESULT([$use_colors])
 if test "x$use_colors" = "xyes" ; then
     AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])
 fi
 
-dnl Debugging 
-AC_MSG_CHECKING([whether to build with debug support])
-AC_ARG_ENABLE([debug], 
-              AC_HELP_STRING([--enable-debug],
-                             [Enable debugging @<:@default=no@:>@]),
-	      [enable_debug="$enableval"], 
-	      [enable_debug=no])
-AC_MSG_RESULT([$enable_debug])
-if test "x$enable_debug" = "xyes" ; then
-    CFLAGS="$CFLAGS -g"
-else
-    CFLAGS="$CFLAGS -DNDEBUG"
+dnl test for LIRC support
+
+AC_ARG_ENABLE([lirc],
+	AC_HELP_STRING([--enable-lirc],
+		[Enable LIRC support]),
+	[enable_lirc=$enableval],
+	[enable_lirc=no])
+if test x$enable_lirc = xyes; then
+	PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+		[AC_MSG_ERROR([liblircclient0 not found])])
+	AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 
-dnl CFLAGS
+AM_CONDITIONAL(ENABLE_LIRC, test x$enable_lirc = xyes)
 
-AC_SUBST(AM_CFLAGS)
-
-CHECK_CFLAG([-Wall])
-CHECK_CFLAG([-Wextra])
-CHECK_CFLAG([-Wno-deprecated-declarations])
-CHECK_CFLAG([-Wmissing-prototypes])
-CHECK_CFLAG([-Wdeclaration-after-statement])
-CHECK_CFLAG([-Wshadow])
-CHECK_CFLAG([-Wpointer-arith])
-CHECK_CFLAG([-Wstrict-prototypes])
-CHECK_CFLAG([-Wcast-qual])
-CHECK_CFLAG([-Wwrite-strings])
 
 dnl Optional screen - help screen
-#AC_MSG_CHECKING([whether to include the help screen])
-#AC_ARG_ENABLE([help-screen], 
-#              AC_HELP_STRING([--enable-help-screen],
-#	                     [Enable the help screen @<:@default=yes@:>@]),
-#	      [help_screen="$enableval"],
-#	      [help_screen=yes])
-#AC_MSG_RESULT([$help_screen])
-#if test "x$help_screen" = "xyes" ; then
-#   AC_DEFINE(ENABLE_HELP_SCREEN, 1, [Enable the help screen])
-#fi
+AC_MSG_CHECKING([whether to include the help screen])
+AC_ARG_ENABLE([help-screen],
+	AS_HELP_STRING([--enable-help-screen],
+		[Enable the help screen @<:@default=yes@:>@]),
+	[help_screen="$enableval"],
+	[help_screen=$disable_mini])
+AC_MSG_RESULT([$help_screen])
+if test "x$help_screen" = "xyes" ; then
+	AC_DEFINE(ENABLE_HELP_SCREEN, 1, [Enable the help screen])
+fi
+
+AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$help_screen = xyes)
 
 dnl Optional screen - browse screen
 #AC_MSG_CHECKING([whether to include the browse screen])r
@@ -209,7 +250,7 @@ AC_ARG_ENABLE([mouse],
               AC_HELP_STRING([--enable-mouse],
 	                     [Enable curses getmouse support @<:@default=yes@:>@]),
 	      [getmouse="$enableval"],
-	      [getmouse=yes])
+	      [getmouse=$disable_mini])
 AC_MSG_RESULT([$getmouse])
 if test "x$getmouse" = "xyes" ; then
    AC_CHECK_LIB([$ncurses], 
@@ -222,9 +263,9 @@ 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@:>@]),
+	                     [Enable artist screen @<:@default=yes@:>@]),
 	      [artist_screen="$enableval"],
-	      [artist_screen=no])
+	      [artist_screen=$disable_mini])
 AC_MSG_RESULT([$artist_screen])
 if test "x$artist_screen" = "xyes" ; then
     AC_DEFINE(ENABLE_ARTIST_SCREEN, 1, [Enable artist screen])
@@ -238,13 +279,27 @@ AC_ARG_ENABLE([search-screen],
               AC_HELP_STRING([--enable-search-screen],
 	                     [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),
 	      [search_screen="$enableval"],
-	      [search_screen=yes])
+	      [search_screen=$disable_mini])
 AC_MSG_RESULT([$search_screen])
 if test "x$search_screen" = "xyes" ; then
     AC_DEFINE(ENABLE_SEARCH_SCREEN, 1, [Enable search screen])
 fi
 
 AM_CONDITIONAL(ENABLE_SEARCH_SCREEN, test x$search_screen = xyes)
+
+dnl Optional screen - song viewer
+AC_MSG_CHECKING([whether to include the song viewer screen])
+AC_ARG_ENABLE([song-screen],
+	AC_HELP_STRING([--enable-song-screen],
+		[Enable song viewer screen @<:@default=yes@:>@]),
+	[song_screen="$enableval"],
+	[song_screen=$disable_mini])
+AC_MSG_RESULT([$song_screen])
+if test "x$song_screen" = "xyes" ; then
+	AC_DEFINE(ENABLE_SONG_SCREEN, 1, [Enable song viewer screen])
+fi
+
+AM_CONDITIONAL(ENABLE_SONG_SCREEN, test x$song_screen = xyes)
   
 dnl Optional screen - key editor
 AC_MSG_CHECKING([whether to include the key editor screen])
@@ -252,7 +307,7 @@ AC_ARG_ENABLE([key-screen],
               AC_HELP_STRING([--enable-key-screen],
 	                     [Enable key editor screen @<:@default=yes@:>@]),
 	      [keydef_screen="$enableval"],
-	      [keydef_screen=yes])
+	      [keydef_screen=$disable_mini])
 AC_MSG_RESULT([$keydef_screen])
 if test "x$keydef_screen" = "xyes" ; then
     AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])
@@ -291,6 +346,22 @@ AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"],
                   [Directory to search for lyrics plugins])
 AC_SUBST(lyrics_plugin_dir)
 
+AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$lyrics_screen = xyes)
+AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$lyrics_screen = xyes)
+
+dnl Optional screen - outputs
+AC_MSG_CHECKING([whether to include the outputs screen])
+AC_ARG_ENABLE([outputs-screen],
+	AC_HELP_STRING([--enable-outputs-screen],
+		[Enable outputs screen @<:@default=yes@:>@]),
+	[outputs_screen=$enableval],
+	[outputs_screen=$disable_mini])
+if test "x$outputs_screen" = "xyes" ; then
+	AC_DEFINE(ENABLE_OUTPUTS_SCREEN, 1, [Enable outputs screen])
+fi
+
+AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$outputs_screen = xyes)
+
 dnl Default host
 AC_MSG_CHECKING([for default MPD host])
 AC_ARG_WITH([default-host],
@@ -321,5 +392,54 @@ AC_ARG_WITH([default-timedisplay_type],
             [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'])
+
+
+dnl
+dnl build options
+dnl
+
+AC_ARG_ENABLE(werror,
+	AS_HELP_STRING([--enable-werror],
+		[Treat warnings as errors (default: disabled)]),
+	ENABLE_WERROR=$enableval,
+	ENABLE_WERROR=no)
+
+if test "x$ENABLE_WERROR" = xyes; then
+	AM_CFLAGS="$AM_CFLAGS -Werror"
+fi
+
+AC_ARG_ENABLE(debug,
+	AS_HELP_STRING([--enable-debug],
+		[Enable debugging (default: disabled)]),
+	ENABLE_DEBUG=$enableval,
+	ENABLE_DEBUG=no)
+
+if test "x$ENABLE_DEBUG" = xno; then
+	AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
+fi
+
+
+dnl
+dnl CFLAGS
+dnl
+
+AC_SUBST(AM_CFLAGS)
+
+CHECK_CFLAG([-Wall])
+CHECK_CFLAG([-Wextra])
+CHECK_CFLAG([-Wno-deprecated-declarations])
+CHECK_CFLAG([-Wmissing-prototypes])
+CHECK_CFLAG([-Wdeclaration-after-statement])
+CHECK_CFLAG([-Wshadow])
+CHECK_CFLAG([-Wpointer-arith])
+CHECK_CFLAG([-Wstrict-prototypes])
+CHECK_CFLAG([-Wcast-qual])
+CHECK_CFLAG([-Wwrite-strings])
+
+
+dnl
+dnl Generate output files
+dnl
+
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile])
 AC_OUTPUT