screen: check MPD status only if connected

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1baa12f1743b5fe4143acff87cbb189657e1c703..57e7bb5ea0c76dfaa8aa9f6d09328238341827d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,13 +4,14 @@ dnl
 
 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
@@ -25,8 +26,7 @@ dnl
 dnl Check for types
 dnl
 
-AC_SOCKLEN_T
-
+AC_MSG_RESULT([$ac_have_socklen_t]) 
 
 dnl
 dnl Check for headers
@@ -81,13 +81,6 @@ if test "x$ncurses" = "xauto"; then
                     [ncurses=ncursesw],
                     [ncurses=ncurses])
 fi
-                    
-AC_CHECK_HEADER([ncursesw/ncurses.h],
-               [have_ncursesw_h=yes],
-               ,)
-
-
-
 
 AC_CHECK_LIB([$ncurses], 
             [initscr],
@@ -95,14 +88,6 @@ AC_CHECK_LIB([$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
 PKG_CHECK_MODULES([GLIB], 
@@ -149,27 +134,6 @@ PKG_CHECK_MODULES([GTHREAD],
 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],
@@ -198,9 +162,26 @@ 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], 
@@ -214,7 +195,7 @@ dnl Optional screen - 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@:>@]),
@@ -294,26 +275,25 @@ AC_ARG_ENABLE([lyrics-screen],
               AC_HELP_STRING([--enable-lyrics-screen],
                             [Enable lyrics screen @<:@default=no@:>@]),
              [lyrics_screen="$enableval"],
-             [lyrics_screen=no])       
+             [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 "$libcurl" != "yes" ; then
- AC_MSG_RESULT([$lyrics_screen])  
+#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 "$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
+#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])
 
@@ -347,6 +327,5 @@ AC_ARG_WITH([default-timedisplay_type],
             [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