![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index 98be7ab6a4fe27513f0da6f4363dfe4f05bf41e0..dc6a413510e0196a99803fc448ba751a038db8c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_INIT
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([ncmpc], [0.11.1-rc1])
+AM_INIT_AUTOMAKE([ncmpc], [0.11.2-svn])
AM_CONFIG_HEADER([config.h])
dnl Check for programs
AC_PROG_CC
AC_PROG_INSTALL
dnl AC_PROG_LIBTOOL
+AC_PROG_LIBTOOL
dnl =======================================================
dnl initialize variables
dnl =======================================================
dnl i18n
-ALL_LINGUAS="es de ru sv"
+ALL_LINGUAS="es da de fr gl no ru sv"
set -- $CFLAGS
dnl Check for types
dnl
-AC_SOCKLEN_T
-
+AC_MSG_RESULT([$ac_have_socklen_t])
dnl
dnl Check for headers
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_HEADER([ncursesw/ncurses.h],
+ [have_ncursesw_h=yes],
+ ,)
+
+
+
+
+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
+ 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
+fi
+
dnl Check for glib-2.4
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"
+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])
[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],
#fi
dnl Optional screen - browse screen
-#AC_MSG_CHECKING([whether to include the browse screen])
+#AC_MSG_CHECKING([whether to include the browse screen])r
#AC_ARG_ENABLE([browse-screen],
# AC_HELP_STRING([--enable-browse-screen],
# [Enable the browse screen @<:@default=yes@:>@]),
[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 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@:>@]),
+ [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 (EXPERIMENTAL) @<:@default=no@:>@]),
+ [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),
[search_screen="$enableval"],
- [search_screen=no])
+ [search_screen=yes])
AC_MSG_RESULT([$search_screen])
if test "x$search_screen" != "xyes" ; then
AC_DEFINE(DISABLE_SEARCH_SCREEN, 1, [Disable search screen])
fi
-
+
dnl Optional screen - key editor
AC_MSG_CHECKING([whether to include the key editor screen])
AC_ARG_ENABLE([key-screen],
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])
fi
+dnl Optional screen - lyrics
+AC_MSG_CHECKING([whether to include the lyrics screen])
+AC_ARG_ENABLE([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
+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])
+
+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])
+
+if test "x$leoslyrics" == "xfixed" ; then
+ AC_DEFINE_UNQUOTED([ENABLE_LYRSRC_LEOSLYRICS], 1,
+ [Leoslyrics inclusion])
+fi
+
+#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],
AC_DEFINE_UNQUOTED([DEFAULT_PORT], [$DEFAULT_PORT], [Default MPD port])
AC_DEFINE_UNQUOTED([DEFAULT_PORT_STR], ["$DEFAULT_PORT"], [Default MPD port])
-
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in])
+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_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_OUTPUT
-
+AC_MSG_WARN([TO BUILD AN INSTALL THE PLUGINS cd TO THE plugins DIRECTORY AND EXECUTE make && make install THERE])