Attachment #196438 for bug #276293




    
      if test "${PKG_CONFIG}" != ""; then
	GNOME_VER=2
	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`

	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])

	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/
      fi

      if test "${GNOME2_CFLAGS}" = ""; then

Lines 12564-12570 Link Here

(-)icewm-1.2.30/configure.old (-2 / +3 lines)
12564	if test "${PKG_CONFIG}" != ""; then	12564	if test "${PKG_CONFIG}" != ""; then
12565	GNOME_VER=2	12565	GNOME_VER=2
12566	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`	12566	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
12567	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`	12567	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
		12568	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
12568		12569
12569		12570
12570	cat >>confdefs.h <<\_ACEOF	12571	cat >>confdefs.h <<\_ACEOF
Lines 12575-12581 Link Here
12575	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"	12576	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
12576	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`	12577	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
12577	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"	12578	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
12578	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"	12579	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
12579	fi	12580	fi
12580		12581
12581	if test "${GNOME2_CFLAGS}" = ""; then	12582	if test "${GNOME2_CFLAGS}" = ""; then

Return to bug 276293

Lines 820-834 Link Here

(-)icewm-1.2.30/configure.in.old (-3 / +3 lines)
820		820
821	if test "${PKG_CONFIG}" != ""; then	821	if test "${PKG_CONFIG}" != ""; then
822	GNOME_VER=2	822	GNOME_VER=2
823	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`	823	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
824	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`	824	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
825		825
826	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])	826	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
827		827
828	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"	828	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
829	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`	829	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
830	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"	830	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
831	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"	831	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/
832	fi	832	fi
833		833
834	if test "${GNOME2_CFLAGS}" = ""; then	834	if test "${GNOME2_CFLAGS}" = ""; then