diff options
| author | jgeboski <jgeboski@gmail.com> | 2015-08-24 17:01:16 -0400 |
|---|---|---|
| committer | jgeboski <jgeboski@gmail.com> | 2015-08-24 17:01:16 -0400 |
| commit | 53cedfaca78278a64cc347e8ed51bb67363b3dcc (patch) | |
| tree | dd2c6cac0c3d5d4af1cccaa9cbbc7a6ca4522572 /configure.ac | |
| parent | 60a42307f24c617029efbb7bcd432d162706c692 (diff) | |
| download | bitlbee-facebook-53cedfaca78278a64cc347e8ed51bb67363b3dcc.tar.gz bitlbee-facebook-53cedfaca78278a64cc347e8ed51bb67363b3dcc.tar.bz2 bitlbee-facebook-53cedfaca78278a64cc347e8ed51bb67363b3dcc.tar.xz | |
Imported changes from purple-facebook
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index c102a0b..c4a83a4 100644 --- a/configure.ac +++ b/configure.ac @@ -44,32 +44,27 @@ m4_define_default( ) AC_ARG_ENABLE( - [debug], + [warnings], [AS_HELP_STRING( - [--enable-debug], - [Enable debugging features] + [--enable-warnings], + [Enable additional compile-time (GCC) warnings] )], - [DEBUG="yes"], - [DEBUG="no"] -) - -AC_ARG_ENABLE( - [minimal-flags], - [AS_HELP_STRING( - [--enable-minimal-flags], - [Disable internal CFLAGS which are not required] - )], - [MINIMAL_FLAGS="yes"], - [MINIMAL_FLAGS="no"] + [WARNINGS="yes"], + [WARNINGS="no"] ) AS_IF( - [test "x$DEBUG" == "xyes"], - [AC_DEFINE(DEBUG_FACEBOOK, 1) - AS_IF( - [test "x$MINIMAL_FLAGS" == "xno"], - [CFLAGS="$CFLAGS -Wall -Wformat-nonliteral -g -O0"] - )] + [test "x$WARNINGS" == "xyes"], + [CFLAGS="$CFLAGS -Wall -Wextra \ + -Waggregate-return \ + -Wdeclaration-after-statement \ + -Wfloat-equal \ + -Wformat \ + -Winit-self \ + -Wmissing-declarations \ + -Wmissing-prototypes \ + -Wno-unused-parameter \ + -Wpointer-arith"] ) AC_ARG_WITH( @@ -81,9 +76,16 @@ AC_ARG_WITH( [plugindir="$with_plugindir"] ) -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32.0]) -PKG_CHECK_MODULES([BITLBEE], [bitlbee >= 3.2.2]) -PKG_CHECK_MODULES([ZLIB], [zlib]) +PKG_CHECK_MODULES([BITLBEE], [bitlbee >= 3.2.2]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32.0 gobject-2.0]) +PKG_CHECK_MODULES([JSON], [json-glib-1.0 >= 0.14.0]) +PKG_CHECK_MODULES([ZLIB], [zlib]) + +PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) +AS_IF( + [test -z "$GLIB_GENMARSHAL"], + [AC_MSG_ERROR([The `glib-genmarshal' tool is missing.])] +) AS_IF( [test -z "$plugindir"], |