![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index dc6a413510e0196a99803fc448ba751a038db8c7..57e7bb5ea0c76dfaa8aa9f6d09328238341827d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_INIT
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([ncmpc], [0.11.2-svn])
+AM_INIT_AUTOMAKE([ncmpc], [0.12~git])
AM_CONFIG_HEADER([config.h])
dnl Check for programs
-AC_PROG_CC
+AC_PROG_CC_C99
AC_PROG_INSTALL
dnl AC_PROG_LIBTOOL
AC_PROG_LIBTOOL
[ncurses=ncursesw],
[ncurses=ncurses])
fi
-
-AC_CHECK_HEADER([ncursesw/ncurses.h],
- [have_ncursesw_h=yes],
- ,)
-
-
-
AC_CHECK_LIB([$ncurses],
[initscr],
[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
PKG_CHECK_MODULES([GLIB],
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],
[])
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_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],
[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])
AC_OUTPUT
-AC_MSG_WARN([TO BUILD AN INSTALL THE PLUGINS cd TO THE plugins DIRECTORY AND EXECUTE make && make install THERE])