zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 10:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 62efcbc46a into 5ddf127f6d

Browse source
This commit is contained in:
François Revol 2014-07-22 00:24:57 +00:00
commit 0ae7227506
3 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autogen.sh
View file

@ -31,6 +31,8 @@ if type lynx >/dev/null 2>&1 ; then
lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt
elif type elinks >/dev/null 2>&1 ; then elif type elinks >/dev/null 2>&1 ; then
elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt
elif type links >/dev/null 2>&1 ; then
links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt
else else
echo "**Error**: No lynx or elinks present" echo "**Error**: No lynx or elinks present"
exit 1 exit 1

4
configure.ac
View file

@ -200,6 +200,10 @@ esac
AC_CHECK_FUNC(socket, [], [ AC_CHECK_FUNC(socket, [], [
AC_CHECK_LIB(socket, socket, [ AC_CHECK_LIB(socket, socket, [
LIBS="$LIBS -lsocket" LIBS="$LIBS -lsocket"
],[
AC_CHECK_LIB(network, socket, [
LIBS="$LIBS -lnetwork"
])
]) ])
]) ])

20
m4/curses.m4
View file

@ -244,6 +244,26 @@ AC_DEFUN([AC_SEARCH_NCURSES], [
[renamed ncurses in /usr/local/include/ncurses]) [renamed ncurses in /usr/local/include/ncurses])
AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
[renamed ncurses in /usr/include/ncurses]) [renamed ncurses in /usr/include/ncurses])
AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
[renamed ncurses in /usr/include/ncurses])
dnl
dnl Try Haiku ncurses
dnl Depending if we are building for the primary or secondary arch
dnl it can be installed at different locations
dnl
if $search_ncurses
then
if test -d /system/develop/headers
then
haiku_arch=`getarch`
for haiku_h in `findpaths -a $haiku_arch B_FIND_PATH_HEADERS_DIRECTORY`
do
AC_NCURSES($haiku_h, ncurses.h, -lncurses,,
[ncurses in $haiku_h])
done
fi
fi
dnl dnl
dnl We couldn't find ncurses, try SysV curses dnl We couldn't find ncurses, try SysV curses