Package: gnome-main-menu
Version: 0.9.13-4
Severity: serious
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd


Hi,

the current version again fails to build on GNU/kFreeBSD.

The problem is caused by this part of debian/patches/nm-glib-0.8.diff:

+NM_GLIB=
+PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
+if test "x$NM_GLIB" = "x"; then
+       PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot 
find NetworkManager Glib library) ])
+fi

This check should be obviously performed only when NM_GLIB will be needed, i.e. when iwlib have been found. Please alter whole debian/patches/nm-glib-0.8.diff as show bellow.

It would also be nice if you can ask upstream
to include debian/patches/non-linux.diff changes.

Thanks in advance.

Petr

--- a/configure.in
+++ b/configure.in
@@ -66,7 +66,10 @@ if test "x$have_iwlib" != "xyes" ; then
        AC_DEFINE(NO_NETMAN, 1, [do not use network manager, wireless])
        PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 
gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 
hal-storage cairo x11])
 else
-       PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 
gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 
hal-storage cairo NetworkManager libnm_glib >= 0.7.0 libnm-util >= 0.7.0 x11])
+NM_GLIB=
+PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
+if test "x$NM_GLIB" = "x"; then
+ PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
+fi
+       PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 
gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 
hal-storage cairo NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11])
        MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw"
        AC_SUBST(MAIN_MENU_LIBS)
 fi






--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to