# # # patch "INSTALL" # from [089912986cc45e39c839600b42609909b4352a16] # to [6b4c8ef0abc5973b54835544a7e323d8e0aede94] # # patch "m4/lua.m4" # from [1253a38c8df4cb482c3588d3d11e6478952f2b8c] # to [5c18b1bf77c9618f16bf35901fa2e15c4b9d44a2] # # patch "monotone.cc" # from [6b1c1e1d03fc904208893a107540e872a1985e39] # to [2866e0bd072efb8bf11664dec9a0be476e5f3f69] # ============================================================ --- INSTALL 089912986cc45e39c839600b42609909b4352a16 +++ INSTALL 6b4c8ef0abc5973b54835544a7e323d8e0aede94 @@ -28,13 +28,19 @@ 1. prerequisites: - Lua 5.1 - GNU IDN Library - on debian: + on debian: apt-get install autoconf automake gettext libboost-dev libz-dev \ libbotan1.7-dev libsqlite3-dev libpcre3-dev \ liblua5.1-0-dev libidn11-dev g++ apt-get install texinfo + on freebsd: + + install the following packages from the ports collection: + databases/sqlite3, devel/automake1.9, devel/boost, devel/gettext, + devel/gmake, devel/pcre, lang/lua, security/botan + on gentoo: emerge autoconf automake gettext \ ============================================================ --- m4/lua.m4 1253a38c8df4cb482c3588d3d11e6478952f2b8c +++ m4/lua.m4 5c18b1bf77c9618f16bf35901fa2e15c4b9d44a2 @@ -12,6 +12,13 @@ AC_DEFUN([MTN_FIND_LUA], else PKG_CHECK_MODULES([LUA], [lua5.1], [found_liblua=yes], [found_liblua=no]) + + # if that has not been found, we also try lua-5.1, as used on FreeBSD + # for example. + if test $found_liblua = no; then + PKG_CHECK_MODULES([LUA], [lua-5.1], + [found_liblua=yes], [found_liblua=no]) + fi fi if test $found_liblua = no; then ============================================================ --- monotone.cc 6b1c1e1d03fc904208893a107540e872a1985e39 +++ monotone.cc 2866e0bd072efb8bf11664dec9a0be476e5f3f69 @@ -241,7 +241,7 @@ cpp_main(int argc, char ** argv) N(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,22), F("This monotone binary requires Botan 1.7.22 or newer.")); N(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), - F("This monotone binary does not work with Botan 1.9.x."); + F("This monotone binary does not work with Botan 1.9.x.")); #endif app_state app;