From dcccfacb68caa97131c60f67cc42a30ef8195c31 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Sun, 29 Dec 2013 01:27:15 +0200 Subject: [PATCH 1/5] autotools: refactored configure.ac This patch implements request #269. --- configure.ac | 119 +++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 55 deletions(-) diff --git a/configure.ac b/configure.ac index 32b60823..1ac66e7d 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ PACKAGE_STATUS="development" ## get git branch and revision if in development if test "x$PACKAGE_STATUS" = xdevelopment; then AM_CONDITIONAL([INCLUDE_GIT_VERSION], [true]) - AC_DEFINE_UNQUOTED([HAVE_GIT_VERSION], [1], [Include git info]) + AC_DEFINE([HAVE_GIT_VERSION], [1], [Include git info]) else AM_CONDITIONAL([INCLUDE_GIT_VERSION], [false]) fi @@ -24,9 +24,8 @@ AC_PROG_CC # get canonical host AC_CANONICAL_HOST -if test "$host_os" == "cygwin"; then - AC_DEFINE([PLATFORM_CYGWIN], [1], [Cygwin]) -fi +AS_IF([test "x$host_os" = xcygwin], + [AC_DEFINE([PLATFORM_CYGWIN], [1], [Cygwin])]) # Options AC_ARG_ENABLE([notifications], @@ -34,76 +33,77 @@ AC_ARG_ENABLE([notifications], AC_ARG_WITH([libxml2], [AS_HELP_STRING([--with-libxml2], [link with libxml2 instead of expat])]) AC_ARG_WITH([xscreensaver], - [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine indle time])]) + [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])]) -# Checks for libraries. -if test "x$with_libxml2" = xyes; then - AC_CHECK_LIB([xml2], [main], [], - [AC_MSG_ERROR([libxml2 is required for profanity])]) -else - AC_CHECK_LIB([expat], [main], [], - [AC_MSG_ERROR([expat is required for profanity])]) -fi +PARSER="" +AS_IF([test "x$with_libxml2" != xyes], + [PKG_CHECK_MODULES([expat], [expat], + [PARSER_CFLAGS="$expat_CFLAGS"; PARSER_LIBS="$expat_LIBS"; PARSER="expat"], + AS_IF([test "x$with_libxml2" = xno], + [AC_MSG_ERROR([expat is required but does not exist])])) + ]) -if test "x$enable_notifications" = xyes; then - AC_CHECK_LIB([notify], [main], [], - [AC_MSG_ERROR([libnotify is required for desktop notifications])]) -elif test "x$enable_notifications" = x; then - AC_CHECK_LIB([notify], [main], [], - [AC_MSG_NOTICE([libnotify not found, desktop notifications not supported])]) -fi +AS_IF([test "x$PARSER" = x -a "x$with_libxml2" != xno], + [PKG_CHECK_MODULES([libxml2], [libxml-2.0], + [PARSER_CFLAGS="$libxml2_CFLAGS"; PARSER_LIBS="$libxml2_LIBS"; PARSER="libxml2"], + AS_IF([test "x$with_libxml2" = xyes], + [AC_MSG_ERROR([libxml2 is required but does not exist])])) + ]) +AS_IF([test "x$PARSER" = x], + [AC_MSG_ERROR([either expat or libxml2 is required for profanity])]) + +AC_CHECK_LIB([resolv], [__res_query], [], + [AC_MSG_ERROR([libresolv is required for profanity])]) +AC_CHECK_LIB([strophe], [main], [], + [AC_MSG_ERROR([libstrophe is required for profanity])]) +PKG_CHECK_MODULES([openssl], [openssl], [], + [AC_MSG_ERROR([openssl is required for profanity])]) +PKG_CHECK_MODULES([glib], [glib-2.0], [], + [AC_MSG_ERROR([glib is required for profanity])]) +PKG_CHECK_MODULES([curl], [libcurl], [], + [AC_MSG_ERROR([libcurl is required for profanity])]) +PKG_CHECK_MODULES([ncursesw], [ncursesw], + [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"], + [PKG_CHECK_MODULES([ncurses], [ncurses], + [NCURSES_CFLAGS="$ncurses_CFLAGS"; NCURSES_LIBS="$ncurses_LIBS"], + [AC_MSG_ERROR([ncurses is required for profanity])])]) + +AS_IF([test "x$enable_notifications" != xno], + [PKG_CHECK_MODULES([libnotify], [libnotify], + [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])], + [AS_IF([test "x$enable_notifications" = xyes], + [AC_MSG_ERROR([libnotify is required but does not exist])], + [AC_MSG_NOTICE([libnotify support will be disabled])])])]) + +# TODO: rewrite this if test "x$with_xscreensaver" = xyes; then AC_CHECK_LIB([Xss], [main], [], [AC_MSG_ERROR([libXss is required for x autoaway support])]) - AC_CHECK_LIB([X11], [main], [], - [AC_MSG_NOTICE([libX11 is required for x autoaway support])]) + AC_CHECK_LIB([X11], [main], [], + [AC_MSG_ERROR([libX11 is required for x autoaway support])]) elif test "x$with_xscreensaver" = x; then AC_CHECK_LIB([Xss], [main], [], [AC_MSG_NOTICE([libXss not found, falling back to profanity auto-away])]) - AC_CHECK_LIB([X11], [main], [], + AC_CHECK_LIB([X11], [main], [], [AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])]) - fi -AC_CHECK_LIB([resolv], [main], [], - [AC_MSG_ERROR([libresolv is required for profanity])]) -AC_CHECK_LIB([ssl], [main], [], - [AC_MSG_ERROR([openssl is required for profanity])]) -AC_CHECK_LIB([strophe], [main], [], - [AC_MSG_ERROR([libstrophe is required for profanity])]) -AC_CHECK_LIB([ncursesw], [main], [], - [AC_MSG_ERROR([ncursesw is required for profanity])]) -AC_CHECK_LIB([glib-2.0], [main], [], - [AC_MSG_ERROR([glib-2.0 is required for profanity])]) -AC_CHECK_LIB([curl], [main], [], - [AC_MSG_ERROR([libcurl is required for profanity])]) -AC_CHECK_LIB([cmocka], [main], [], - [AC_MSG_NOTICE([cmocka not found, will not be able to run tests])]) - -# Checks for header files. -AC_CHECK_HEADERS([stdlib.h string.h]) +PKG_CHECK_MODULES([cmocka], [cmocka], [], + [AC_MSG_NOTICE([cmocka is not found, will not be able to run tests])]) # Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw AC_CHECK_HEADERS([ncursesw/ncurses.h], [], []) AC_CHECK_HEADERS([ncurses.h], [], []) -# Checks for pkgconfig modules -PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl]) - -if test "x$enable_notifications" != xno; then - PKG_CHECK_MODULES([NOTIFY], [libnotify], [], - [AC_MSG_NOTICE([libnotify module not found])]) -fi - # Default parameters AM_CFLAGS="-Wall" -if test "x$PACKAGE_STATUS" = xdevelopment; then - AM_CFLAGS="$AM_CFLAGS -Wunused -Werror" -fi -LIBS="$LIBS $DEPS_LIBS $NOTIFY_LIBS" - -AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS" +AS_IF([test "x$PACKAGE_STATUS" = xdevelopment], + [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"]) +AM_CPPFLAGS="$openssl_CFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS" +AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS $NCURSES_CFLAGS" +LIBS="$LIBS $openssl_LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS" +LIBS="$LIBS $PARSER_LIBS $NCURSES_LIBS" AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CPPFLAGS) @@ -116,3 +116,12 @@ AC_CHECK_FUNCS([atexit memset strdup strstr]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT + +echo "" +echo "PACKAGE_STATUS : $PACKAGE_STATUS" +echo "AM_CFLAGS : $AM_CFLAGS" +echo "AM_CPPFLAGS : $AM_CPPFLAGS" +echo "LIBS : $LIBS" +echo "XML Parser : $PARSER" +echo "" +echo "Now you can run \`make' to build profanity" From 2519e450e3f9718bd907139586a66de48a505f52 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Tue, 31 Dec 2013 01:39:21 +0200 Subject: [PATCH 2/5] configure.ac: added check for wget_wch support --- configure.ac | 54 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 1ac66e7d..861fa267 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.65]) AC_INIT([profanity], [0.4.0], [boothj5web@gmail.com]) PACKAGE_STATUS="development" -## get git branch and revision if in development +### Get git branch and revision if in development if test "x$PACKAGE_STATUS" = xdevelopment; then AM_CONDITIONAL([INCLUDE_GIT_VERSION], [true]) AC_DEFINE([HAVE_GIT_VERSION], [1], [Include git info]) @@ -19,15 +19,15 @@ AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign subdir-objects]) -# Checks for programs. +### Checks for programs. AC_PROG_CC -# get canonical host +### Get canonical host AC_CANONICAL_HOST AS_IF([test "x$host_os" = xcygwin], [AC_DEFINE([PLATFORM_CYGWIN], [1], [Cygwin])]) -# Options +### Options AC_ARG_ENABLE([notifications], [AS_HELP_STRING([--enable-notifications], [enable desktop notifications])]) AC_ARG_WITH([libxml2], @@ -59,15 +59,41 @@ AC_CHECK_LIB([strophe], [main], [], [AC_MSG_ERROR([libstrophe is required for profanity])]) PKG_CHECK_MODULES([openssl], [openssl], [], [AC_MSG_ERROR([openssl is required for profanity])]) + +# TODO: autodetect of XML parser libstrophe linked with + PKG_CHECK_MODULES([glib], [glib-2.0], [], [AC_MSG_ERROR([glib is required for profanity])]) PKG_CHECK_MODULES([curl], [libcurl], [], [AC_MSG_ERROR([libcurl is required for profanity])]) + +### Check for ncurses library PKG_CHECK_MODULES([ncursesw], [ncursesw], - [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"], + [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"; NCURSES="ncursesw"], [PKG_CHECK_MODULES([ncurses], [ncurses], - [NCURSES_CFLAGS="$ncurses_CFLAGS"; NCURSES_LIBS="$ncurses_LIBS"], + [NCURSES_CFLAGS="$ncurses_CFLAGS"; NCURSES_LIBS="$ncurses_LIBS"; NCURSES="ncurses"], [AC_MSG_ERROR([ncurses is required for profanity])])]) +AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS" +LIBS="$LIBS $NCURSES_LIBS" + +### Check wide characters support in ncurses library +CFLAGS_RESTORE="$CFLAGS" +CFLAGS="$CFLAGS $NCURSES_CFLAGS" +AC_CACHE_CHECK([for wget_wch support in $NCURSES], ncurses_cv_wget_wch, + [AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include + int main() { + (void)wget_wch(NULL, NULL); + return 0; + } + ])], + [ncurses_cv_wget_wch=yes], + [ncurses_cv_wget_wch=no]) + ]) +CFLAGS="$CFLAGS_RESTORE" + +AS_IF([test "x$ncurses_cv_wget_wch" != xyes], + [AC_MSG_ERROR([ncurses does not support wide characters])]) AS_IF([test "x$enable_notifications" != xno], [PKG_CHECK_MODULES([libnotify], [libnotify], @@ -89,28 +115,28 @@ elif test "x$with_xscreensaver" = x; then [AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])]) fi +### cmocka is required only for tests, profanity shouldn't be linked with it +### TODO: pass cmocka_CFLAGS and cmocka_LIBS to Makefile.am PKG_CHECK_MODULES([cmocka], [cmocka], [], [AC_MSG_NOTICE([cmocka is not found, will not be able to run tests])]) -# Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw +### Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw AC_CHECK_HEADERS([ncursesw/ncurses.h], [], []) AC_CHECK_HEADERS([ncurses.h], [], []) -# Default parameters +### Default parameters AM_CFLAGS="-Wall" AS_IF([test "x$PACKAGE_STATUS" = xdevelopment], [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"]) -AM_CPPFLAGS="$openssl_CFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS" -AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS $NCURSES_CFLAGS" +AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS $glib_CFLAGS $curl_CFLAGS" +AM_CPPFLAGS="$AM_CPPFLAGS $libnotify_CFLAGS $PARSER_CFLAGS" LIBS="$LIBS $openssl_LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS" -LIBS="$LIBS $PARSER_LIBS $NCURSES_LIBS" +LIBS="$LIBS $PARSER_LIBS" AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CPPFLAGS) -# Checks for typedefs, structures, and compiler characteristics. - -# Checks for library functions. +### Checks for library functions. AC_FUNC_MALLOC AC_CHECK_FUNCS([atexit memset strdup strstr]) From 249e60e07d14cb427b9b1c434eb1faa507b6a431 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Wed, 1 Jan 2014 22:17:51 +0200 Subject: [PATCH 3/5] configure.ac: glib must be at least 2.26 Profanity uses GDateTime structure that appeared in glib-2.26. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 861fa267..3a2f08eb 100644 --- a/configure.ac +++ b/configure.ac @@ -62,8 +62,8 @@ PKG_CHECK_MODULES([openssl], [openssl], [], # TODO: autodetect of XML parser libstrophe linked with -PKG_CHECK_MODULES([glib], [glib-2.0], [], - [AC_MSG_ERROR([glib is required for profanity])]) +PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [], + [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])]) PKG_CHECK_MODULES([curl], [libcurl], [], [AC_MSG_ERROR([libcurl is required for profanity])]) From c7551b50c3a9ed5998a0a61ab742058f43834451 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Thu, 2 Jan 2014 19:19:19 +0200 Subject: [PATCH 4/5] configure.ac: removed autoconf version check autoconf-2.63 works well --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3a2f08eb..bb042e66 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.65]) AC_INIT([profanity], [0.4.0], [boothj5web@gmail.com]) PACKAGE_STATUS="development" From 0cdbfecb35670fbcb84f0b6914cc35460f2fb3ca Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Thu, 2 Jan 2014 22:18:42 +0200 Subject: [PATCH 5/5] configure.ac: added check for expat without pkg-config and some refactoring --- configure.ac | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index bb042e66..7bfd0ab1 100644 --- a/configure.ac +++ b/configure.ac @@ -34,12 +34,17 @@ AC_ARG_WITH([libxml2], AC_ARG_WITH([xscreensaver], [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])]) +### Select first existing xml library among expat and libxml2 PARSER="" +PARSER_LIBS="" +PARSER_CFLAGS="" AS_IF([test "x$with_libxml2" != xyes], [PKG_CHECK_MODULES([expat], [expat], [PARSER_CFLAGS="$expat_CFLAGS"; PARSER_LIBS="$expat_LIBS"; PARSER="expat"], - AS_IF([test "x$with_libxml2" = xno], - [AC_MSG_ERROR([expat is required but does not exist])])) + [AC_CHECK_LIB([expat], [XML_ParserCreate], + [PARSER_LIBS="-lexpat"; PARSER="expat"], + AS_IF([test "x$with_libxml2" = xno], + [AC_MSG_ERROR([expat is required but does not exist])]))]) ]) AS_IF([test "x$PARSER" = x -a "x$with_libxml2" != xno], @@ -51,20 +56,23 @@ AS_IF([test "x$PARSER" = x -a "x$with_libxml2" != xno], AS_IF([test "x$PARSER" = x], [AC_MSG_ERROR([either expat or libxml2 is required for profanity])]) +AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS" +LIBS="$LIBS $PARSER_LIBS" +### Check for libstrophe dependencies AC_CHECK_LIB([resolv], [__res_query], [], [AC_MSG_ERROR([libresolv is required for profanity])]) -AC_CHECK_LIB([strophe], [main], [], - [AC_MSG_ERROR([libstrophe is required for profanity])]) PKG_CHECK_MODULES([openssl], [openssl], [], [AC_MSG_ERROR([openssl is required for profanity])]) +AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS" +LIBS="$LIBS $openssl_LIBS" # TODO: autodetect of XML parser libstrophe linked with - -PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [], - [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])]) -PKG_CHECK_MODULES([curl], [libcurl], [], - [AC_MSG_ERROR([libcurl is required for profanity])]) +CFLAGS_RESTORE="$CFLAGS" +CFLAGS="$CFLAGS $AM_CPPFLAGS" +AC_CHECK_LIB([strophe], [parser_new], [], + [AC_MSG_ERROR([libstrophe linked with $PARSER is required for profanity])]) +CFLAGS="$CFLAGS_RESTORE" ### Check for ncurses library PKG_CHECK_MODULES([ncursesw], [ncursesw], @@ -94,6 +102,11 @@ CFLAGS="$CFLAGS_RESTORE" AS_IF([test "x$ncurses_cv_wget_wch" != xyes], [AC_MSG_ERROR([ncurses does not support wide characters])]) +### Check for other profanity dependencies +PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [], + [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])]) +PKG_CHECK_MODULES([curl], [libcurl], [], + [AC_MSG_ERROR([libcurl is required for profanity])]) AS_IF([test "x$enable_notifications" != xno], [PKG_CHECK_MODULES([libnotify], [libnotify], [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])], @@ -127,10 +140,8 @@ AC_CHECK_HEADERS([ncurses.h], [], []) AM_CFLAGS="-Wall" AS_IF([test "x$PACKAGE_STATUS" = xdevelopment], [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"]) -AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS $glib_CFLAGS $curl_CFLAGS" -AM_CPPFLAGS="$AM_CPPFLAGS $libnotify_CFLAGS $PARSER_CFLAGS" -LIBS="$LIBS $openssl_LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS" -LIBS="$LIBS $PARSER_LIBS" +AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS" +LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS" AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CPPFLAGS)