diff --git a/configure.ac b/configure.ac
index cd1dc0780df1d3bf779fc7468709f071a63d704e..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
dnl =======================================================
dnl initialize variables
dnl =======================================================
dnl i18n
-ALL_LINGUAS="es de fr no 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
-ncurses=ncursesw
+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$ncurses" = "xauto"; then
+ AC_CHECK_LIB([ncursesw],
+ [initscr],
+ [ncurses=ncursesw],
+ [ncurses=ncurses])
+fi
+
AC_CHECK_LIB([$ncurses],
[initscr],
- [LIBS="$LIBS -l$ncurses"],
- [AC_MSG_ERROR($ncurses library is required)])
+ [LIBS="$LIBS -l$ncurses"],
+ [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
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)
+
+#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@:>@]),
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_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 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])
AC_OUTPUT
-