Re: Error while compiling latest CVS

[Tom Parker <palfrey tevp net>]

Magnus Ottosson wrote:
> I get alot of errors when I compile with the latest CVS of NM. I have 
> atached a file with the output of the compilation...

The attached patch fixes all the compile problems I could find - 
certainly looks like it should fix the problem you had, but you may find 
others.

Tom
--
palfrey tevp net - http://tevp.net
Illegitimus non carborundum

Index: configure.in
===================================================================
RCS file: /cvs/gnome/NetworkManager/configure.in,v
retrieving revision 1.56
diff -u -r1.56 configure.in
--- configure.in	18 Jan 2005 16:09:23 -0000	1.56
+++ configure.in	20 Jan 2005 17:23:56 -0000
@@ -138,9 +138,9 @@
 fi
 AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno)
 
-#PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
-#AC_SUBST(PANEL_APPLET_CFLAGS)
-#AC_SUBST(PANEL_APPLET_LIBS)
+PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
+AC_SUBST(PANEL_APPLET_CFLAGS)
+AC_SUBST(PANEL_APPLET_LIBS)
 
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 AC_SUBST(LIBGNOMEUI_CFLAFS)
Index: panel-applet/Makefile.am
===================================================================
RCS file: /cvs/gnome/NetworkManager/panel-applet/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- panel-applet/Makefile.am	12 Jan 2005 18:40:04 -0000	1.18
+++ panel-applet/Makefile.am	20 Jan 2005 17:23:57 -0000
@@ -23,6 +23,7 @@
 	-DGDK_DISABLE_DEPRECATED				\
 	-DGNOME_DISABLE_DEPRECATED			\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DVERSION=\"$(VERSION)\" \
 	$(NULL)
 
 libnm_notification_applet_la_SOURCES =	\
Index: panel-applet/NMWirelessApplet.h
===================================================================
RCS file: /cvs/gnome/NetworkManager/panel-applet/NMWirelessApplet.h,v
retrieving revision 1.24
diff -u -r1.24 NMWirelessApplet.h
--- panel-applet/NMWirelessApplet.h	19 Jan 2005 17:36:58 -0000	1.24
+++ panel-applet/NMWirelessApplet.h	20 Jan 2005 17:23:57 -0000
@@ -99,7 +99,9 @@
  */
 typedef struct
 {
+#ifdef BUILD_NOTIFICATION_ICON
 	EggTrayIcon		 parent;
+#endif
 
 	DBusConnection		*connection;
 	GConfClient		*gconf_client;