diff options
| author | Jaka Kranjc | 2008-10-01 12:04:24 +0200 |
|---|---|---|
| committer | Jaka Kranjc | 2008-10-01 12:04:24 +0200 |
| commit | 81416139a0b567ff664d319b5b2daaeeefd7d192 (patch) | |
| tree | 77c4d8885d212f50b2c311acfc0e35c9865f3028 | |
| parent | 4e33bdf8f6bc35d4424f5aec39a945b325ec08c0 (diff) | |
gtk-gnutella: deps reworked, bug 13130 fixed
(cherry-picked from commit 5c4a7eb5f5befa62ac2e9d0ed3292e3bfdc9e886)
| -rwxr-xr-x | ftp/gtk-gnutella/BUILD | 17 | ||||
| -rwxr-xr-x | ftp/gtk-gnutella/CONFIGURE | 2 | ||||
| -rwxr-xr-x | ftp/gtk-gnutella/DEPENDS | 5 | ||||
| -rw-r--r-- | ftp/gtk-gnutella/HISTORY | 3 |
4 files changed, 22 insertions, 5 deletions
diff --git a/ftp/gtk-gnutella/BUILD b/ftp/gtk-gnutella/BUILD index 01e073073b..5d0d8b1ea1 100755 --- a/ftp/gtk-gnutella/BUILD +++ b/ftp/gtk-gnutella/BUILD @@ -1,7 +1,19 @@ if [ "$GNUTELLA_GTK_IP6" == "y" ]; then - OPTS="-D ipv6='true' ${OPTS}" + OPTS="-Dd_ipv6='true' ${OPTS}" else - OPTS="-D ipv6='false' ${OPTS}" + OPTS="-Dd_ipv6=undef ${OPTS}" +fi && + +if [ "$GNUTELLA_GTK_FAST_ASSERT" == "y" ]; then + OPTS="-Dd_fast_assert='yes' ${OPTS}" +else + OPTS="-Dd_fast_assert=undef ${OPTS}" +fi && + +if [ "$GNUTELLA_GTK_NLS" == "y" ]; then + OPTS="-Dd_nls='yes' ${OPTS}" +else + OPTS="-Dd_nls=undef ${OPTS}" fi && if [ "$GNUTELLA_GTK_RMTCTRL" == "y" ]; then @@ -15,6 +27,5 @@ fi && -Dsysconfdir=${INSTALL_ROOT}/etc \ -Dlocalstatedir=${INSTALL_ROOT}/var \ -Dcc=/usr/bin/gcc \ - -Dd_nls=undef \ $OPTS && make diff --git a/ftp/gtk-gnutella/CONFIGURE b/ftp/gtk-gnutella/CONFIGURE index d7035d0d8e..86b30468f0 100755 --- a/ftp/gtk-gnutella/CONFIGURE +++ b/ftp/gtk-gnutella/CONFIGURE @@ -2,4 +2,6 @@ message "${MESSAGE_COLOR}GTK+2 interface is slower${DEFAULT_COLOR}" && config_query_list GNUTELLA_GTK "Which gtk+ interface do you want?" \ 1.x 2.x && config_query GNUTELLA_GTK_IP6 "Use IPv6?" y && +config_query GNUTELLA_GTK_FAST_ASSERT "Enable fast assertions?" y && +config_query GNUTELLA_GTK_NLS "Enable NLS support?" y && config_query GNUTELLA_GTK_RMTCTRL "Experimental remote control?" n diff --git a/ftp/gtk-gnutella/DEPENDS b/ftp/gtk-gnutella/DEPENDS index 9ce07e154c..a67ef3e2ae 100755 --- a/ftp/gtk-gnutella/DEPENDS +++ b/ftp/gtk-gnutella/DEPENDS @@ -1,5 +1,6 @@ -depends libxml2 && -optional_depends "dbus" "-D dbus='true'" "-D dbus='false'" && +depends libxml2 && +optional_depends "dbus" "-Dd_dbus='true'" "-Dd_dbus=undef" && +optional_depends "gnutls" "-Dd_gnutls='true'" "-Dd_gnutls=undef" && if [ "$GNUTELLA_GTK" = "1.x" ]; then depends gtk+ "-Dgtkversion=1" else diff --git a/ftp/gtk-gnutella/HISTORY b/ftp/gtk-gnutella/HISTORY index 792ae9989f..03871a6344 100644 --- a/ftp/gtk-gnutella/HISTORY +++ b/ftp/gtk-gnutella/HISTORY @@ -1,3 +1,6 @@ +2008-09-28 Mathieu Lonjaret <lejatorn@sourcemage.org> + * DEPENDS, CONFIGURE, BUILD: reworks the deps, fixes bug 13130 + 2008-04-02 Mathieu Lonjaret <lejatorn@sourcemage.org> * DETAILS: update to 0.96.5 |