diff options
| author | James Booth <boothj5@gmail.com> | 2014-05-01 22:29:06 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-05-01 22:29:06 +0100 |
| commit | 59e9083224f104fefa7c94023543abc1d889a166 (patch) | |
| tree | 56017646c5e1c843de22626a1081ab3c3d5ccce0 | |
| parent | 524b1f2383c6018ab810b79ed9bd8508d3fe03c0 (diff) | |
| download | profani-tty-59e9083224f104fefa7c94023543abc1d889a166.tar.gz | |
Fixed gnutls dependency for ubuntu
| -rw-r--r-- | configure.ac | 6 | ||||
| -rwxr-xr-x | install-all.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8be3bd3d..f94adcb7 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,7 @@ 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])]) -PKG_CHECK_MODULES([gnutls], [gnutls >= 3.0.0], [], +PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.8.0], [], [AC_MSG_ERROR([gnutls is required for profanity])]) AS_IF([test "x$PLATFORM" = xosx], [LIBS="$LIBS -lcurl"]) @@ -219,9 +219,9 @@ AC_CHECK_HEADERS([ncurses.h], [], []) AM_CFLAGS="-Wall -Wno-deprecated-declarations" AS_IF([test "x$PACKAGE_STATUS" = xdevelopment], [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"]) -AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS $gnutls_CFLAGS" +AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS $LIBGNUTLS_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\"" -LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS $gnutls_LIBS" +LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS $LIBGNUTLS_LIBS" AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CPPFLAGS) diff --git a/install-all.sh b/install-all.sh index 940703fa..24a8c265 100755 --- a/install-all.sh +++ b/install-all.sh @@ -24,7 +24,7 @@ debian_prepare() echo echo Profanity installer... installing dependencies echo - sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev + sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev libgnutls-dev } |