![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index 3ffc870097dd9a2e76052610acfe639514afaa4b..f4a9a7da0c93c99ce0df436368988dbb9bd0f4e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
-dnl
-dnl $Id$
-dnl
-
-AC_INIT
+AC_PREREQ(2.60)
+AC_INIT(ncurses MPD client, 0.12~alpha1, max@duempel.org, ncmpc)
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([ncmpc], [0.11.2-svn])
+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
+AC_PROG_CC_C99
AC_PROG_INSTALL
-dnl AC_PROG_LIBTOOL
-AC_PROG_LIBTOOL
dnl =======================================================
dnl initialize variables
set -- $CFLAGS
-dnl
-dnl Check for types
-dnl
-
-AC_MSG_RESULT([$ac_have_socklen_t])
-
dnl
dnl Check for headers
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([basename strcasestr])
+AC_CHECK_FUNCS([strcasestr])
+
+
+dnl
+dnl ncmpc-mini
+dnl
+
+AC_ARG_ENABLE(mini,
+ AS_HELP_STRING([--enable-mini],
+ [Build ncmpc-mini (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
+ ncurses=ncurses
+else
+ auto=auto
+ disable_mini=yes
+ ncurses=auto
+fi
dnl
])
+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])
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],
[ncurses=ncursesw],
[ncurses=ncurses])
fi
-
-AC_CHECK_HEADER([ncursesw/ncurses.h],
- [have_ncursesw_h=yes],
- ,)
-
-
-
AC_CHECK_LIB([$ncurses],
[initscr],
[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 wide character support II
-if test "x$ncurses" != "xncursesw" ; then
- if test "x$have_ncursesw_h" = "xyes" ; then
- AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [wide-char wget_ch()])
- AC_DEFINE(USE_NCURSESW, 1, [use wide-char ncurses library])
- fi
+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 Check for glib-2.4
dnl i18n
+
+AC_MSG_CHECKING([national language support])
+AC_ARG_ENABLE([nls],
+ AS_HELP_STRING([--enable-nls], [Enable national language support]),
+ [enable_nls=$enableval],
+ [enable_nls=$disable_mini])
+AC_MSG_RESULT([$enable_nls])
+
+if test "x$enable_nls" = xno; then
+ glib24=no
+ nls=no
+fi
+
AM_NLS
if test "x$glib24" = "xyes"; then
nls=$USE_NLS
AM_PO_SUBDIRS
fi
-dnl check for gthreads
-PKG_CHECK_MODULES([GTHREAD],
- [gthread-2.0],
- [gthread=yes],
- [AC_MSG_WARN([gthread-2.0 >= 0.20 is required the lyrics screen])])
-AC_SUBST(GTHREAD_LIBS)
-AC_SUBST(GTHREAD_CFLAGS)
-
-dnl check for gmodule
-PKG_CHECK_MODULES([GMODULE],
- [gmodule-2.0],
- [gmodule=yes],
- [AC_MSG_WARN([gmodule-2.0 >= 0.20 is required the plugin system])])
-AC_SUBST(GMODULE_LIBS)
-AC_SUBST(GMODULE_CFLAGS)
-
-dnl check for libcurl
-PKG_CHECK_MODULES([libcurl],
- [libcurl],
- [libcurl=yes],
- #[libcurl=yes,LIBS="$LIBS -lcurl"], #doesn't work for me on arch
- [AC_MSG_WARN([libcurl is required for the lyrics screen])])
-
-if test "x$libcurl" = "xyes"; then
- LIBS="$LIBS -lcurl"
+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=yes])
+AC_MSG_RESULT([$use_colors])
+if test "x$use_colors" = "xyes" ; then
+ AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])
fi
-
-dnl check for expat
-expat=expat
-AC_CHECK_LIB([$expat],
- [XML_ParserCreate],
- [have_expat=yes],
- [AC_MSG_WARN($expat library is required for lyrics screen)])
-if test "x$have_expat" = "xyes"; then
-LIBS="$LIBS -l$expat"
-fi
-
-#if test "x$gthread-2.0" != "xyes"; then
-# PKG_CHECK_MODULES([GTHREAD],
-# [glib-2.0 >= 2.2],
-# [nls=no],
-# [AC_MSG_ERROR([glib-2.2 is required])])
-#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])
+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
+AM_CONDITIONAL(ENABLE_LIRC, test x$enable_lirc = xyes)
+
dnl Debugging
AC_MSG_CHECKING([whether to build with debug support])
AC_ARG_ENABLE([debug],
[enable_debug=no])
AC_MSG_RESULT([$enable_debug])
if test "x$enable_debug" = "xyes" ; then
- CFLAGS="$CFLAGS -Wall -g -DDEBUG"
+ CFLAGS="$CFLAGS -g"
+else
+ CFLAGS="$CFLAGS -DNDEBUG"
fi
+dnl CFLAGS
+
+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
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],
[])
fi
-dnl Plugin loading for lyrics sources
-AC_MSG_CHECKING([whether to include the plugin infrastructure])
-AC_ARG_ENABLE([plugin-support],
- AC_HELP_STRING([--enable-plugin-support],
- [Enable loading lyrics plugins @<:@default=yes@:>@]),
- [plugin_support="$enableval"],
- [plugin_support=yes])
-if test "x$plugin_support" != "xyes" ; then
- AC_DEFINE(DISABLE_PLUGIN_SYSTEM, 1, [Disable plugin system])
-fi
-
-if test "x$gmodule" != "xyes" ; then
- AC_DEFINE(DISABLE_PLUGIN_SYSTEM, 1, [Disable plugin system])
- plugin_support=no
-fi
-AC_MSG_RESULT([$plugin_support])
-
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=no@:>@]),
[artist_screen="$enableval"],
- [artist_screen=no])
+ [artist_screen=yes])
AC_MSG_RESULT([$artist_screen])
-if test "x$artist_screen" != "xyes" ; then
- AC_DEFINE(DISABLE_ARTIST_SCREEN, 1, [Disable artist screen])
+if test "x$artist_screen" = "xyes" ; then
+ AC_DEFINE(ENABLE_ARTIST_SCREEN, 1, [Enable artist screen])
fi
+AM_CONDITIONAL(ENABLE_ARTIST_SCREEN, test x$artist_screen = xyes)
+
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 (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(DISABLE_SEARCH_SCREEN, 1, [Disable 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 - key editor
AC_MSG_CHECKING([whether to include the key editor 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(DISABLE_KEYDEF_SCREEN, 1, [Disable key editor screen])
+if test "x$keydef_screen" = "xyes" ; then
+ AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])
fi
-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=yes@:>@]),
- [clock_screen="$enableval"],
- [clock_screen=yes])
-AC_MSG_RESULT([$clock_screen])
-if test "x$clock_screen" != "xyes" ; then
- AC_DEFINE(DISABLE_CLOCK_SCREEN, 1, [Disable clock screen])
-fi
+AM_CONDITIONAL(ENABLE_KEYDEF_SCREEN, test x$keydef_screen = xyes)
dnl Optional screen - lyrics
AC_MSG_CHECKING([whether to include the lyrics screen])
AC_HELP_STRING([--enable-lyrics-screen],
[Enable lyrics screen @<:@default=no@:>@]),
[lyrics_screen="$enableval"],
- [lyrics_screen=yes])
-if test "x$lyrics_screen" != "xyes" ; then
- AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- lyrics_screen=no
-fi
-#lyrics_screen=yes
-#if test "x$libcurl" != "xyes" ; then
-# AC_MSG_RESULT([$lyrics_screen])
- # AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- # lyrics_screen=no
-#fi
-if test "x$gthread" != "xyes" ; then
- AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- lyrics_screen=no
+ [lyrics_screen=no])
+if test "x$lyrics_screen" = "xyes" ; then
+ AC_DEFINE(ENABLE_LYRICS_SCREEN, 1, [Enable lyrics screen])
fi
-#if test "x$have_expat" != "xyes" ; then
-# AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
-# lyrics_screen=no
-#fi
-AC_MSG_RESULT([$lyrics_screen])
+AM_CONDITIONAL(ENABLE_LYRICS_SCREEN, test x$lyrics_screen = xyes)
-dnl hd
-AC_MSG_CHECKING([whether to build with .lyrics support])
-AC_ARG_WITH([lyrics-hd],
- AC_HELP_STRING([[--with-lyrics-leoslyrics[=plugin/fixed/no]]],
- [enable leoslyrics lyrics source @<:@default=plugin@:>@]),
- [hd=$withval],
- [hd=plugin])
-
-if test "x$plugin_support" != "xyes" ; then
- if test "x$hd" == "xplugin" ; then
- hd=fixed
- AC_MSG_NOTICE([Enable lyrics plugin support to compile as a plugin!])
- fi
-fi
-AC_MSG_RESULT([$hd])
-if test "x$hd" == "xfixed"; then
- AC_DEFINE_UNQUOTED([ENABLE_LYRSRC_HD], 1,
- [~/.lyrics inclusion])
-fi
-if test "x$hd" == "xplugin" ; then
- src_lyr_plugins="${src_lyr_plugins}hd "
-fi
-AM_CONDITIONAL(HD_FIXED, test x$hd = xfixed)
-
-dnl leoslyrics
-AC_MSG_CHECKING([whether to build with leoslyrics])
-AC_ARG_WITH([lyrics-leoslyrics],
- AC_HELP_STRING([[--with-lyrics-leoslyrics[=plugin/fixed/no]]],
- [enable leoslyrics lyrics source @<:@default=plugin@:>@]),
- [leoslyrics=$withval],
- [leoslyrics=plugin])
-
-if test "x$plugin_support" != "xyes" ; then
- if test "x$leoslyrics" == "xplugin" ; then
- leoslyrics=fixed
- AC_MSG_NOTICE([Enable lyrics plugin support to compile as a plugin!])
- fi
-fi
-
-if test "x$have_expat" != "xyes" ; then
- leoslyrics=no
-fi
-if test "x$libcurl" != "xyes" ; then
- leoslyrics=no
-fi
-
-if test "x$leoslyrics" == "xplugin" ; then
- src_lyr_plugins="${src_lyr_plugins}leoslyrics "
-fi
-AC_MSG_RESULT([$leoslyrics])
+AC_MSG_RESULT([$lyrics_screen])
-if test "x$leoslyrics" == "xfixed" ; then
- AC_DEFINE_UNQUOTED([ENABLE_LYRSRC_LEOSLYRICS], 1,
- [Leoslyrics inclusion])
+AC_ARG_WITH([lyrics-plugin-dir],
+ AC_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]],
+ [Directory where lyrics plugins are stored @<:@default=PREFIX/lib/ncmpc/lyrics@:>@]),
+ [lyrics_plugin_dir=$withval],
+ [lyrics_plugin_dir=""])
+if test "x${lyrics_plugin_dir}" = "x"; then
+ if test "x${prefix}" = "xNONE"; then
+ lyrics_plugin_dir="${ac_default_prefix}/lib/ncmpc/lyrics"
+ else
+ lyrics_plugin_dir="${prefix}/lib/ncmpc/lyrics"
+ fi
fi
+AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"],
+ [Directory to search for lyrics plugins])
+AC_SUBST(lyrics_plugin_dir)
-#if test "x$leoslyrics" == "xfixed" ; then
- # src_lyr_fixed="${src_lyr_fixed}../plugins/leoslyrics/lyrics_leoslyrics.c "
- # leoslyrics_fixed=yes
-#fi
-AM_CONDITIONAL(LEOSLYRICS_FIXED, test x$leoslyrics = xfixed)
-
-dnl plugins directory
-AC_ARG_WITH([plugin-dir],
- AC_HELP_STRING([[--with-plugin-dir[=DIRECTORY]]],
- [Directory where plugins are stored @<:@default=/usr/share/ncmpc/modules@:>@]),
- [plugindir=$withval],
- [plugindir="/usr/share/ncmpc/modules"])
-AC_DEFINE_UNQUOTED([PLUGIN_DIR_SYSTEM], ["$plugindir"],
- [Directory to search for plugins])
-
-AC_SUBST(plugindir)
dnl Default host
AC_MSG_CHECKING([for default MPD host])
AC_ARG_WITH([default-host],
[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_SUBST(src_lyr_plugins)
-AC_SUBST(src_lyr_fixed)
-AC_CONFIG_FILES([Makefile src/Makefile plugins/Makefile doc/Makefile po/Makefile
- plugins/hd/Makefile
- plugins/leoslyrics/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile])
AC_OUTPUT
-AC_MSG_WARN([TO BUILD AN INSTALL THE PLUGINS cd TO THE plugins DIRECTORY AND EXECUTE make && make install THERE])