![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index f58e270955d71dd9992b824d5e44ea27759a0935..6273a09ed0a6b0ab52d39e75d9226996ddd83b28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.15, max@duempel.org)
+AC_INIT(ncmpc, 0.26, max@duempel.org)
+
+VERSION_MAJOR=0
+VERSION_MINOR=26
+VERSION_REVISION=0
+VERSION_EXTRA=0
+
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([foreign 1.11 dist-xz subdir-objects])
+AM_SILENT_RULES
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
+
dnl Check for programs
AC_PROG_CC_C99
AC_PROG_INSTALL
+AX_WITH_CURSES
+
+AS_IF([ test "x$ax_cv_curses" = xno ],
+ [AC_MSG_ERROR([No curses support detected.])
+ ])
dnl =======================================================
dnl initialize variables
dnl =======================================================
dnl i18n
-ALL_LINGUAS=`grep -v '^\#' po/LINGUAS`
+ALL_LINGUAS=`grep -v '^\#' $srcdir/po/LINGUAS`
set -- $CFLAGS
AC_ARG_ENABLE(mini,
AS_HELP_STRING([--enable-mini],
- [Build ncmpc-mini, i.e. without all optional features (default: disabled)]),
- [enable_mini=$enableval],
+ [Build ncmpc-mini, i.e. without all optional features @<:@default=no@:>@]),,
[enable_mini=no])
AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
auto=no
disable_mini=no
auto_mini=no
- ncurses=ncurses
else
auto=auto
disable_mini=yes
auto_mini=auto
- ncurses=auto
-fi
-
-
-dnl
-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 wide character support
-AC_ARG_ENABLE([wide],
- AC_HELP_STRING([--enable-wide],
- [Enable wide character support]),
- [enable_wide=$enableval],
- [enable_wide=auto])
-
-
-dnl ncurses
-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$enable_wide" = "xno"; then
- if test "x$ncurses" = "xauto"; then
- dnl select narrow ncurses
- ncurses=ncurses
- fi
-
- if test "x$ncurses" = "xncursesw"; then
- AC_MSG_WARN([Narrow ncmpc linking against wide libncurses])
- fi
-fi
-
-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)])
-
-if test "x$ncurses" = "xncursesw"; then
- AC_CHECK_HEADER([ncursesw/ncurses.h],
- AC_DEFINE([HAVE_NCURSESW_NCURSES_H], [1], [ncursesw/ncurses.h]),
- ,)
-fi
-
-
-dnl wide character support II
-
-if test "x$enable_wide" = "xauto" ; then
- AC_CHECK_LIB([$ncurses],
- [wget_wch],
- [enable_wide=yes],
- [enable_wide=no])
-fi
-
-AC_MSG_CHECKING([wide character support])
-AC_MSG_RESULT([$enable_wide])
-
-if test "x$enable_wide" = "xyes" ; then
- AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support])
-fi
+AC_CANONICAL_HOST
+
+case "$host_os" in
+mingw32* | windows*)
+ LIBS="$LIBS -lws2_32"
+
+ AC_CONFIG_FILES([
+ src/win/ncmpc_win32_rc.rc
+ ])
+ AC_CHECK_TOOL(WINDRES, windres)
+ HAVE_WINDOWS=1
+ ;;
+*)
+ AC_CHECK_FUNC([socket],
+ [],
+ [AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"],
+ [AC_MSG_ERROR(No UNIX socket API found)])
+ ])
+
+ AC_CHECK_FUNC([gethostbyname],
+ [],
+ [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
+ [AC_MSG_ERROR(No UNIX gethostbyname API found)])
+ ])
+
+ HAVE_WINDOWS=0
+esac
+AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
dnl multi-byte character support
AC_ARG_ENABLE([multibyte],
- AC_HELP_STRING([--disable-multibyte],
- [Disable multibyte character support (default: enabled)]),
- [enable_multibyte=$enableval],
+ AS_HELP_STRING([--disable-multibyte],
+ [Disable multibyte character support @<:@default=yes@:>@]),,
[enable_multibyte=$disable_mini])
if test x$enable_multibyte = xyes; then
AC_DEFINE([ENABLE_MULTIBYTE], [1], [Enable multibyte character support])
else
- if test x$enable_wide = xyes; then
+ if test "x$ax_cv_curses_enhanced" = xyes; then
AC_MSG_WARN(wide characters without multibyte characters makes little sense)
fi
fi
-dnl Check for glib-2.4
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
- [AC_MSG_ERROR([glib 2.4 is required])])
+dnl Check for GLib
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30],,
+ [AC_MSG_ERROR([glib 2.30 is required])])
+dnl Check for libmpdclient 2.9
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.9],,
+ [AC_MSG_ERROR([libmpdclient2 is required])])
dnl i18n
AC_ARG_ENABLE([locale],
- AC_HELP_STRING([--disable-locale],
- [Disable locale support (default: auto)]),
- [enable_locale=$enableval],
+ AS_HELP_STRING([--disable-locale],
+ [Disable locale support @<:@default=auto@:>@]),,
[enable_locale=$auto_mini])
if test x$enable_locale = xyes; then
AM_PO_SUBDIRS
fi
+dnl Networking
+
+AC_ARG_ENABLE(tcp,
+ AS_HELP_STRING([--disable-tcp],
+ [Disable TCP support @<:@default=enabled@:>@]),,
+ [enable_tcp=$disable_mini])
+if test "x$enable_tcp" = xyes; then
+ AC_DEFINE([ENABLE_TCP], 1, [Define to enable TCP support])
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_CHECK_FUNCS([getaddrinfo])
+fi
+
+AC_ARG_ENABLE([async-connect],
+ AS_HELP_STRING([--enable-async-connect],
+ [Disable asynchronous connect @<:@default=yes@:>@]),,
+ [enable_async_connect=$disable_mini])
+AM_CONDITIONAL(ENABLE_ASYNC_CONNECT, test x$enable_async_connect = xyes)
+if test "x$enable_async_connect" = xyes; then
+ AC_DEFINE([ENABLE_ASYNC_CONNECT], [1], [Enable asynchronous connect?])
+fi
+
dnl enable colors
-AC_MSG_CHECKING([color support])
AC_ARG_ENABLE([colors],
- AC_HELP_STRING([--enable-colors],
- [Enable color support]),
- [use_colors=$enableval],
- [use_colors=$disable_mini])
-AC_MSG_RESULT([$use_colors])
-if test "x$use_colors" = "xyes" ; then
- AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])
-fi
+ AS_HELP_STRING([--enable-colors],
+ [Enable color support]),,
+ [enable_colors=auto])
+AC_MSG_CHECKING([whether to include color support])
+AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ],
+ [AS_IF([ test "x$disable_mini" = xyes],
+ [AS_IF([ test "x$ax_cv_curses_color" = xyes ],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])],
+ [AS_IF([ test "x$enable_colors" = xyes ],
+ AC_MSG_ERROR(["No color support found in curses library"])
+ AC_MSG_RESULT([no]),
+ AC_MSG_RESULT([no])
+ )
+ ])
+ ],
+ [AC_MSG_RESULT([no])
+ AC_MSG_WARN(["Colors disabled due to mini mode being enabled."])]
+ )],
+ [AC_MSG_RESULT([no])])
dnl test for LIRC support
AC_ARG_ENABLE([lirc],
- AC_HELP_STRING([--enable-lirc],
- [Enable LIRC support]),
- [enable_lirc=$enableval],
+ AS_HELP_STRING([--enable-lirc],
+ [Enable LIRC support]),,
[enable_lirc=no])
if test x$enable_lirc = xyes; then
- PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
- [AC_MSG_ERROR([liblircclient0 not found])])
+ PKG_CHECK_MODULES([LIBLIRCCLIENT], [lirc],,
+ [PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+ [AC_MSG_ERROR([lirc not found])]
+ )]
+ )
+
AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
fi
AC_MSG_CHECKING([whether to include the help screen])
AC_ARG_ENABLE([help-screen],
AS_HELP_STRING([--enable-help-screen],
- [Enable the help screen @<:@default=yes@:>@]),
- [help_screen="$enableval"],
- [help_screen=$disable_mini])
-AC_MSG_RESULT([$help_screen])
-if test "x$help_screen" = "xyes" ; then
+ [Enable the help screen @<:@default=yes@:>@]),,
+ [enable_help_screen=$disable_mini])
+AC_MSG_RESULT([$enable_help_screen])
+if test "x$enable_help_screen" = "xyes" ; then
AC_DEFINE(ENABLE_HELP_SCREEN, 1, [Enable the help screen])
fi
-AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$help_screen = xyes)
-
-dnl Optional screen - 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@:>@]),
-# [browse_screen="$enableval"],
-# [browse_screen=yes])
-#AC_MSG_RESULT([$browse_screen])
-#if test "x$browse_screen" = "xyes" ; then
-# AC_DEFINE(ENABLE_BROWSE_SCREEN, 1, [Enable the browse screen])
-#fi
+AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
dnl Optional - curses getmouse support
-AC_MSG_CHECKING([whether to include mouse support])
+
+MPD_WITH_LIBRARY([CURSES],
+ [AC_CHECK_FUNC([getmouse],
+ [ax_cv_curses_mouse=yes],
+ [ax_cv_curses_mouse=no])])
+
AC_ARG_ENABLE([mouse],
- AC_HELP_STRING([--enable-mouse],
- [Enable curses getmouse support @<:@default=yes@:>@]),
- [getmouse="$enableval"],
- [getmouse=$disable_mini])
-AC_MSG_RESULT([$getmouse])
-if test "x$getmouse" = "xyes" ; then
- AC_CHECK_LIB([$ncurses],
- [getmouse],
- [AC_DEFINE([HAVE_GETMOUSE], [1], [$ncurses - getmouse()])],
- [])
-fi
+ AS_HELP_STRING([--enable-mouse],
+ [Enable curses getmouse support @<:@default=yes@:>@]),,
+ [enable_mouse=auto])
+
+AC_MSG_CHECKING([whether to include mouse support])
+
+AS_IF([ test "x$enable_mouse" = xyes || test "x$enable_mouse" = xauto ],
+ [AS_IF([ test "x$disable_mini" = xyes],
+ [AS_IF([ test "x$ax_cv_curses_mouse" = xyes ],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_GETMOUSE], [1], [Enable mouse support])],
+ [AC_MSG_RESULT([no])
+ AS_IF([ test "x$enable_mouse" = xyes ],
+ [AC_MSG_ERROR(["No mouse support found in curses library"])
+ ])
+ ])
+ ],
+ [AC_MSG_RESULT([no])
+ AC_MSG_WARN("Mouse disabled due to mini mode being enabled.")]
+ )],
+ [AC_MSG_RESULT([no])])
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 @<:@default=yes@:>@]),
- [artist_screen="$enableval"],
- [artist_screen=$disable_mini])
-AC_MSG_RESULT([$artist_screen])
-if test "x$artist_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-artist-screen],
+ [Enable artist screen @<:@default=yes@:>@]),,
+ [enable_artist_screen=$disable_mini])
+AC_MSG_RESULT([$enable_artist_screen])
+if test "x$enable_artist_screen" = "xyes" ; then
AC_DEFINE(ENABLE_ARTIST_SCREEN, 1, [Enable artist screen])
fi
-AM_CONDITIONAL(ENABLE_ARTIST_SCREEN, test x$artist_screen = xyes)
+AM_CONDITIONAL(ENABLE_ARTIST_SCREEN, test x$enable_artist_screen = xyes)
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=yes@:>@]),
- [search_screen="$enableval"],
- [search_screen=$disable_mini])
-AC_MSG_RESULT([$search_screen])
-if test "x$search_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-search-screen],
+ [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),,
+ [enable_search_screen=$disable_mini])
+AC_MSG_RESULT([$enable_search_screen])
+if test "x$enable_search_screen" = "xyes" ; then
AC_DEFINE(ENABLE_SEARCH_SCREEN, 1, [Enable search screen])
fi
-AM_CONDITIONAL(ENABLE_SEARCH_SCREEN, test x$search_screen = xyes)
+AM_CONDITIONAL(ENABLE_SEARCH_SCREEN, test x$enable_search_screen = xyes)
dnl Optional screen - song viewer
AC_MSG_CHECKING([whether to include the song viewer screen])
AC_ARG_ENABLE([song-screen],
- AC_HELP_STRING([--enable-song-screen],
- [Enable song viewer screen @<:@default=yes@:>@]),
- [song_screen="$enableval"],
- [song_screen=$disable_mini])
-AC_MSG_RESULT([$song_screen])
-if test "x$song_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-song-screen],
+ [Enable song viewer screen @<:@default=yes@:>@]),,
+ [enable_song_screen=$disable_mini])
+AC_MSG_RESULT([$enable_song_screen])
+if test "x$enable_song_screen" = "xyes" ; then
AC_DEFINE(ENABLE_SONG_SCREEN, 1, [Enable song viewer screen])
fi
-AM_CONDITIONAL(ENABLE_SONG_SCREEN, test x$song_screen = xyes)
+AM_CONDITIONAL(ENABLE_SONG_SCREEN, test x$enable_song_screen = xyes)
dnl Optional screen - key editor
AC_MSG_CHECKING([whether to include the key editor screen])
AC_ARG_ENABLE([key-screen],
- AC_HELP_STRING([--enable-key-screen],
- [Enable key editor screen @<:@default=yes@:>@]),
- [keydef_screen="$enableval"],
- [keydef_screen=$disable_mini])
-AC_MSG_RESULT([$keydef_screen])
-if test "x$keydef_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-key-screen],
+ [Enable key editor screen @<:@default=yes@:>@]),,
+ [enable_key_screen=$disable_mini])
+AC_MSG_RESULT([$enable_key_screen])
+if test "x$enable_key_screen" = "xyes" ; then
AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])
fi
-AM_CONDITIONAL(ENABLE_KEYDEF_SCREEN, test x$keydef_screen = xyes)
+AM_CONDITIONAL(ENABLE_KEYDEF_SCREEN, test x$enable_key_screen = xyes)
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=no])
-if test "x$lyrics_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-lyrics-screen],
+ [Enable lyrics screen @<:@default=no@:>@]),,
+ [enable_lyrics_screen=no])
+
+case "$host_os" in
+mingw32* | windows*)
+ AS_IF([ test "x$enable_lyrics_screen" = xyes ],
+ [AC_MSG_ERROR([Lyrics screen is not yet compatible with windows.])
+ ])
+esac
+
+if test "x$enable_lyrics_screen" = "xyes" ; then
AC_DEFINE(ENABLE_LYRICS_SCREEN, 1, [Enable lyrics screen])
fi
-AM_CONDITIONAL(ENABLE_LYRICS_SCREEN, test x$lyrics_screen = xyes)
+AM_CONDITIONAL(ENABLE_LYRICS_SCREEN, test x$enable_lyrics_screen = xyes)
-AC_MSG_RESULT([$lyrics_screen])
+AC_MSG_RESULT([$enable_lyrics_screen])
AC_ARG_WITH([lyrics-plugin-dir],
- AC_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]],
+ AS_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=""])
[Directory to search for lyrics plugins])
AC_SUBST(lyrics_plugin_dir)
-AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$lyrics_screen = xyes)
-AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$lyrics_screen = xyes)
+AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$enable_lyrics_screen = xyes)
dnl Optional screen - outputs
AC_MSG_CHECKING([whether to include the outputs screen])
AC_ARG_ENABLE([outputs-screen],
- AC_HELP_STRING([--enable-outputs-screen],
- [Enable outputs screen @<:@default=yes@:>@]),
- [outputs_screen=$enableval],
- [outputs_screen=$disable_mini])
-if test "x$outputs_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-outputs-screen],
+ [Enable outputs screen @<:@default=yes@:>@]),,
+ [enable_outputs_screen=$disable_mini])
+
+if test "x$enable_outputs_screen" = "xyes" ; then
AC_DEFINE(ENABLE_OUTPUTS_SCREEN, 1, [Enable outputs screen])
fi
-AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$outputs_screen = xyes)
-
-dnl Default host
-AC_MSG_CHECKING([for default MPD host])
-AC_ARG_WITH([default-host],
- AC_HELP_STRING([--with-default-host=ARG],
- [Default MPD host @<:@localhost@:>@]),
- [DEFAULT_HOST="$withval"],
- [DEFAULT_HOST="localhost"])
-AC_MSG_RESULT([$DEFAULT_HOST])
-AC_DEFINE_UNQUOTED([DEFAULT_HOST], ["$DEFAULT_HOST"], [Default MPD host])
-
-dnl Default port
-AC_MSG_CHECKING([for default MPD port])
-AC_ARG_WITH([default-port],
- AC_HELP_STRING([--with-default-port=ARG],
- [Default port @<:@6600@:>@]),
- [DEFAULT_PORT="$withval"],
- [DEFAULT_PORT="6600"])
-AC_MSG_RESULT([$DEFAULT_PORT])
-AC_DEFINE_UNQUOTED([DEFAULT_PORT], [$DEFAULT_PORT], [Default MPD port])
-AC_DEFINE_UNQUOTED([DEFAULT_PORT_STR], ["$DEFAULT_PORT"], [Default MPD port])
-
-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'])
+AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$enable_outputs_screen = xyes)
+AC_MSG_RESULT([$enable_outputs_screen])
+dnl Optional screen - client-to-client chat
+AC_MSG_CHECKING([whether to include the chat screen])
+AC_ARG_ENABLE([chat-screen],
+ AC_HELP_STRING([--enable-chat-screen],
+ [Enable chat screen @<:@default=no@:>@]),,
+ [enable_chat_screen=no])
+if test "x$enable_chat_screen" = "xauto"; then
+ enable_chat_screen=yes
+fi
+AC_MSG_RESULT([$enable_chat_screen])
+if test "x$enable_chat_screen" = "xyes" ; then
+ AC_DEFINE(ENABLE_CHAT_SCREEN, 1, [Enable chat screen])
+fi
+AM_CONDITIONAL(ENABLE_CHAT_SCREEN, test x$enable_chat_screen = xyes)
+
+AM_CONDITIONAL(ENABLE_SCREEN_TEXT,
+ test x$enable_lyrics_screen = xyes -o x$enable_chat_screen = xyes)
+
+dnl
+dnl Windows OS Resource File
+dnl
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_REVISION)
+AC_SUBST(VERSION_EXTRA)
+
dnl
dnl build options
dnl
AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror],
- [Treat warnings as errors (default: disabled)]),
- ENABLE_WERROR=$enableval,
- ENABLE_WERROR=no)
+ [Treat warnings as errors @<:@default=no@:>@]),,
+ enable_werror=no)
-if test "x$ENABLE_WERROR" = xyes; then
- AM_CFLAGS="$AM_CFLAGS -Werror"
+if test "x$enable_werror" = xyes; then
+ AX_APPEND_COMPILE_FLAGS([-Werror])
fi
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
- [Enable debugging (default: disabled)]),
- ENABLE_DEBUG=$enableval,
- ENABLE_DEBUG=no)
+ [Enable debugging @<:@default=no@:>@]),,
+ enable_debug=no)
-if test "x$ENABLE_DEBUG" = xno; then
+if test "x$enable_debug" = xno; then
AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
+
+ AX_APPEND_COMPILE_FLAGS([-ffunction-sections])
+ AX_APPEND_COMPILE_FLAGS([-fdata-sections])
+
+ AX_APPEND_LINK_FLAGS([-Wl,--gc-sections])
+fi
+
+AC_ARG_ENABLE(test,
+ AS_HELP_STRING([--enable-test],
+ [build the test programs @<:@default=no@:>@]),,
+ enable_test=$enable_debug)
+
+AM_CONDITIONAL(ENABLE_TEST, test "x$enable_test" = xyes)
+
+dnl
+dnl autogenerated documentation
+dnl
+
+AC_ARG_ENABLE(documentation,
+ AS_HELP_STRING([--enable-documentation],
+ [build doxygen documentation @<:@default=no@:>@]),,
+ enable_documentation=no)
+
+if test x$enable_documentation = xyes; then
+ AC_PATH_PROG(DOXYGEN, doxygen)
+ if test x$DOXYGEN = x; then
+ AC_MSG_ERROR([doxygen not found])
+ fi
+ AC_SUBST(DOXYGEN)
fi
+AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
dnl
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])
+AX_APPEND_COMPILE_FLAGS([-fvisibility=hidden])
+AX_APPEND_COMPILE_FLAGS([-ffast-math])
+AX_APPEND_COMPILE_FLAGS([-ftree-vectorize])
+
+AX_APPEND_COMPILE_FLAGS([-Wall])
+AX_APPEND_COMPILE_FLAGS([-Wextra])
+AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
+AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes])
+AX_APPEND_COMPILE_FLAGS([-Wshadow])
+AX_APPEND_COMPILE_FLAGS([-Wpointer-arith])
+AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes])
+AX_APPEND_COMPILE_FLAGS([-Wcast-qual])
+AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
dnl
dnl
AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile])
-AC_OUTPUT
+AC_OUTPUT(doc/doxygen.conf)