From b2cb466227fd2046f4f0e4c788f7f123d5c0a4eb Mon Sep 17 00:00:00 2001 From: william Date: Fri, 21 Feb 2014 10:33:58 +0000 Subject: [PATCH 1/2] Added opensuse support for the install. Now getting an error relating ncurses wget_wch after the libstrophe compile --- install-all.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/install-all.sh b/install-all.sh index 656d9d90..4314d342 100755 --- a/install-all.sh +++ b/install-all.sh @@ -27,6 +27,14 @@ fedora_prepare() sudo yum -y install gcc git autoconf automake openssl-devel.$ARCH expat-devel.$ARCH ncurses-devel.$ARCH glib2-devel.$ARCH libnotify-devel.$ARCH libcurl-devel.$ARCH libXScrnSaver-devel.$ARCH libotr3-devel.$ARCH } +opensuse_prepare() +{ + echo + echo Profanity installer...installing dependencies + echo + sudo zypper -n in gcc git automake autoconf libgnutls-openssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel +} + cygwin_prepare() { echo @@ -138,6 +146,8 @@ if [ "${OS}" = "Linux" ]; then DIST=fedora elif [ -f /etc/debian_version ]; then DIST=debian + elif [ -f /etc/os-release ]; then + DIST=opensuse fi else echo $OS | grep -i cygwin @@ -159,6 +169,10 @@ debian) debian_prepare install_lib_strophe install_profanity ;; +opensuse) opensuse_prepare + install_lib_strophe + install_profanity + ;; cygwin) cygwin_prepare cyg_install_lib_strophe cyg_install_profanity From 5b734156a5ef0147396f328fe523f07d02d24ff5 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 25 Feb 2014 22:50:25 +0000 Subject: [PATCH 2/2] Changes to get install-all.sh working on fresh opensuse VM --- configure.ac | 5 +++-- install-all.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index efe4fcc3..f9b8f31d 100644 --- a/configure.ac +++ b/configure.ac @@ -82,8 +82,9 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw], [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"; NCURSES="ncursesw"], [PKG_CHECK_MODULES([ncurses], [ncurses], [NCURSES_CFLAGS="$ncurses_CFLAGS"; NCURSES_LIBS="$ncurses_LIBS"; NCURSES="ncurses"], - [AC_CHECK_LIB([ncurses], [main], [], - [AC_MSG_ERROR([ncurses is required for profanity])])])]) + [AC_CHECK_LIB([ncursesw], [main], [], + [AC_CHECK_LIB([ncurses], [main], [], + [AC_MSG_ERROR([ncurses is required for profanity])])])])]) AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS" LIBS="$LIBS $NCURSES_LIBS" diff --git a/install-all.sh b/install-all.sh index 0e1da522..97066736 100755 --- a/install-all.sh +++ b/install-all.sh @@ -44,7 +44,7 @@ opensuse_prepare() echo echo Profanity installer...installing dependencies echo - sudo zypper -n in gcc git automake autoconf libgnutls-openssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel + sudo zypper -n in gcc git automake make autoconf libopenssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel } cygwin_prepare()