diff --git a/configure.ac b/configure.ac
index e3e68eec19c5a825701df22d60778853abe5b810..ef9a617cdb2c88955167e5e086b31a4933c77a4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl $Id$
dnl
-AC_INIT
+AC_INIT(ncurses MPD client, 0.12~git, max@duempel.org, ncmpc)
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([ncmpc], [0.11.2-svn])
+AM_INIT_AUTOMAKE([gnu 1.6 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
dnl Check for types
dnl
-AC_SOCKLEN_T
-
+AC_MSG_RESULT([$ac_have_socklen_t])
dnl
dnl Check for headers
[ncurses=ncursesw],
[ncurses=ncurses])
fi
-
AC_CHECK_LIB([$ncurses],
[initscr],
[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
PKG_CHECK_MODULES([GLIB],
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 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])
AC_ARG_ENABLE([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@:>@]),
AC_DEFINE(DISABLE_KEYDEF_SCREEN, 1, [Disable 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
-
dnl Optional screen - lyrics
AC_MSG_CHECKING([whether to include the lyrics screen])
AC_ARG_ENABLE([lyrics-screen],
AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
lyrics_screen=no
fi
-#lyrics_screen=yes
-if test "$libcurl" != "yes" ; then
- AC_MSG_RESULT([$lyrics_screen])
- # AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- # lyrics_screen=no
-fi
-if test "$gthread" != "yes" ; then
- AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- lyrics_screen=no
-AC_MSG_RESULT([$lyrics_screen])
-fi
-if test "$have_expat" != "yes" ; then
- AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- lyrics_screen=no
-fi
+
+AM_CONDITIONAL(LYRICS, test x$lyrics_screen = xyes)
AC_MSG_RESULT([$lyrics_screen])
+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)
+
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_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile])
AC_OUTPUT