aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Added configure conditions for OSX brew installed readline

Browse Source
This commit is contained in:
James Booth 2015-02-03 22:04:30 +00:00
parent 82ddbf332d
commit f80f79e0b5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -135,8 +135,8 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
[AC_MSG_ERROR([glib 2.26 or higher is required for profanity])]) [AC_MSG_ERROR([glib 2.26 or higher is required for profanity])])
PKG_CHECK_MODULES([curl], [libcurl], [], PKG_CHECK_MODULES([curl], [libcurl], [],
[AC_MSG_ERROR([libcurl is required for profanity])]) [AC_MSG_ERROR([libcurl is required for profanity])])
###AC_CHECK_LIB([readline], [main], [], AC_CHECK_LIB([readline], [main], [],
### [AC_MSG_ERROR([libreadline is required for profanity])]) [AC_MSG_ERROR([libreadline is required for profanity])])
AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"]) AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"])
@ -236,10 +236,12 @@ AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS"
AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\"" AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\""
LIBS="$glib_LIBS $curl_LIBS $libnotify_LIBS $LIBS" LIBS="$glib_LIBS $curl_LIBS $libnotify_LIBS $LIBS"
LIBS="-lreadline $LIBS" ### Use brew installed gnu readline
AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS" AS_IF([test "x$PLATFORM" = xosx], [
AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS" LIBS="-lreadline $LIBS"
AC_SUBST(AM_LDFLAGS) 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_CFLAGS)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)