From e361ea69221bded41784b9f4f1682a64baac13ac Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 8 Mar 2015 18:47:01 +0000 Subject: [PATCH] Added conditional OSX check for readline --- configure.ac | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index c38c09c3..ec599f7c 100644 --- a/configure.ac +++ b/configure.ac @@ -135,8 +135,16 @@ 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])]) -AC_CHECK_LIB([readline], [main], [], - [AC_MSG_ERROR([libreadline is required for profanity])]) + +AS_IF([test "x$PLATFORM" != xosx], + [AC_CHECK_LIB([readline], [main], [], + [AC_MSG_ERROR([libreadline is required for profanity])])], + [AC_CHECK_FILE([/usr/local/opt/readline/lib], + [LIBS="-lreadline $LIBS" + AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS" + AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS" + AC_SUBST(AM_LDFLAGS)], + [AC_MSG_ERROR([libreadline is required for profanity])])]) AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"]) @@ -236,13 +244,6 @@ AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\"" LIBS="$glib_LIBS $curl_LIBS $libnotify_LIBS $LIBS" -### Use brew installed gnu readline -AS_IF([test "x$PLATFORM" = xosx], [ - LIBS="-lreadline $LIBS" - AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS" - AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS" - AC_SUBST(AM_LDFLAGS)]) - AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CPPFLAGS)