Commit 9da17116 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

Post BRANCH releas bump re-enable the disable_deprecated flags


2005-11-14  Jody Goldberg <jody@gnome.org>

	* configure.in : Post BRANCH releas bump
	  re-enable the disable_deprecated flags
parent fb0f6239
2005-11-14 Jody Goldberg <jody@gnome.org>
* configure.in : Post BRANCH releas bump
re-enable the disable_deprecated flags
2005-11-14 Jody Goldberg <jody@gnome.org>
* Release 1.6.1
......
2005-11-14 Jody Goldberg <jody@gnome.org>
* configure.in : Post BRANCH releas bump
re-enable the disable_deprecated flags
2005-11-14 Jody Goldberg <jody@gnome.org>
* Release 1.6.1
......
......@@ -4,8 +4,8 @@ dnl (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.)
AC_PREREQ(2.54)
m4_define([gnumeric_version_epoch], [1])
m4_define([gnumeric_version_major], [6])
m4_define([gnumeric_version_minor], [1])
m4_define([gnumeric_version_major], [7])
m4_define([gnumeric_version_minor], [0])
m4_define([gnumeric_version_extra], [])
m4_define([gnumeric_full_version],
[gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor[]gnumeric_version_extra])
......@@ -211,20 +211,20 @@ GNUMERIC_PLUGIN_LDFLAGS="-avoid-version $GNUMERIC_PLUGIN_LDFLAGS"
AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
dnl disable for in stable release, re-enable for development series
dnl CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
dnl CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
dnl if test "x$gnumeric_with_gtk" = "xtrue"; then
dnl CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED"
dnl CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED"
dnl CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE"
dnl CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
dnl CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED"
dnl fi
dnl if test "x$gnumeric_with_gnome" = "xtrue"; then
dnl CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
dnl CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
dnl CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
dnl fi
CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
if test "x$gnumeric_with_gtk" = "xtrue"; then
CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE"
CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED"
fi
if test "x$gnumeric_with_gnome" = "xtrue"; then
CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
fi
# CHECK HILDON
# -------------------------
......
......@@ -12,3 +12,4 @@ ssconvert
ssindex
test-pango
GNOME_Gnumeric-gtk.xml
HILDON_Gnumeric-gtk.xml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment