GNOME.org
 

gnumeric r16951 - in trunk: . plugins/gb po

Author: mortenw
Date: Wed Nov  5 21:25:04 2008
New Revision: 16951
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16951&view=rev

Log:
2008-11-05  Morten Welinder  <terra gnome org>

	* configure.in: Remove check for gcc 2.96.  Remove gb support.
	Clean up.  Make non-gnome the default.



Removed:
   trunk/plugins/gb/
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/po/POTFILES.skip

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Nov  5 21:25:04 2008
@@ -25,6 +25,7 @@
 	* Fix SUMIF issues.  [#557782]
 	* Fix LOOKUP critical.  [#559005]
 	* Fix GROWTH/TREND crash.  [#559363]
+	* Make non-gnome the default.  [#558840]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov  5 21:25:04 2008
@@ -82,26 +82,6 @@
 dnl Propagate Gnome-specific variable ACLOCAL_FLAGS to Makefile.
 AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
 
-if test "$GCC" = "yes"; then
-  gcc_check=`$CC -v 2>&1 | grep '^gcc version 2\.96'`
-  if test "$gcc_check" != ""; then
-    # I know a dead parrot when I see one, and I am looking at
-    # one now.
-    AC_MSG_ERROR([You cannot compile Gnumeric with RedHat gcc 2.96.
-We have seen too many subtle compiler errors.
-Please use another compiler, for example a gcc 2.95 series compiler.])
-    # Mate, this parrot wouldn't "vooom!" if you put four million
-    # Volts through it!
-    #
-    # Actually, the real problem here is that there are so many
-    # different compilers calling themselves 2.96.  RedHat, listen
-    # up!  That's a MAJOR BLUNDER!  If the user just thinks of it
-    # as "gcc 2.96" then how the H*** are we going to get bug
-    # reports we can use?  Chances are the newer 2.96 compilers
-    # are just fine, but how can we know?
-  fi
-fi
-
 dnl *****************************
 # Check for zlib.
 dnl
@@ -192,6 +172,14 @@
 
 ui_msg=
 
+with_win32=no
+case $host_os in
+mingw* | pw32* | cygwin*)
+    with_win32=yes
+    GNUMERIC_PLUGIN_LDFLAGS="-no-undefined $GNUMERIC_LIBS -Wl,--enable-runtime-pseudo-relo,--export-all-symbols \$(top_builddir)/src/libspreadsheet.la -s"
+    ;;
+esac
+
 dnl *******************
 dnl Should we use gtk ?
 dnl *******************
@@ -208,34 +196,36 @@
 	PKG_CHECK_MODULES(GTK, [$gnumeric_gtk_reqs])
 fi 
 
-gnumeric_with_gnome=$gnumeric_with_gtk
-if test "x$gnumeric_with_gtk" = "xtrue" ; then
+if test "x$gnumeric_with_gtk" = xtrue ; then
 	AC_DEFINE(GNM_WITH_GTK, 1, [Define if UI is built])
 	libspreadsheet_reqs="$libspreadsheet_reqs $libspreadsheet_gtk_reqs"
 	gnumeric_reqs="$gnumeric_reqs $gnumeric_gtk_reqs"
+fi
 
+gnumeric_with_gnome=false
+if test "x$gnumeric_with_gtk" = xtrue -a "x$with_win32" = xno ; then
 	dnl ************************************
 	dnl Are the GNOME extensions available ?
 	dnl ************************************
 
-	gnumeric_with_gnome=true
+	ui_msg="Gtk+ (Gnome disabled)"
 	AC_ARG_WITH(gnome,
 		[--{with,without}-gnome    Use GNOME extensions],
-		if test "x$withval" = xno; then
-			gnumeric_with_gnome=false
-			ui_msg="Gtk+ (Gnome disabled by request)"
+		if test "x$withval" == xyes; then
+			ui_msg="Gnome"
+			gnumeric_with_gnome=true
 		fi
 	)
-	if test "x$gnumeric_with_gnome" = "xtrue"; then
+	if test "x$gnumeric_with_gnome" = xtrue; then
 		PKG_CHECK_MODULES(GNOME, [$libspreadsheet_gnome_reqs],
 			[ui_msg="Gnome"],
-			[ui_msg="Gtk (missing gnome dependencies)" ; gnumeric_with_gnome=false])
+			[ui_msg="Gtk (missing Gnome dependencies)" ; gnumeric_with_gnome=false])
 		PKG_CHECK_MODULES(GNOME, [$gnumeric_gnome_reqs],
 			[ui_msg="Gnome"],
-			[ui_msg="Gtk (missing gnome dependencies)" ; gnumeric_with_gnome=false])
+			[ui_msg="Gtk (missing Gnome dependencies)" ; gnumeric_with_gnome=false])
 	fi
 
-	if test "x$gnumeric_with_gnome" = "xtrue"; then
+	if test "x$gnumeric_with_gnome" = xtrue; then
 		AC_DEFINE(GNM_WITH_GNOME, 1, [Define if GNOME extensions are available])
 		libspreadsheet_reqs="$libspreadsheet_reqs $libspreadsheet_gnome_reqs"
 		gnumeric_reqs="$gnumeric_reqs $gnumeric_gnome_reqs"
@@ -257,14 +247,6 @@
 AC_SUBST(GNUMERIC_LIBS)
 AC_SUBST(GNUMERIC_CFLAGS)
 
-with_win32=no
-case $host_os in
-mingw* | pw32* | cygwin*)
-    with_win32=yes
-    GNUMERIC_PLUGIN_LDFLAGS="-no-undefined $GNUMERIC_LIBS -Wl,--enable-runtime-pseudo-relo,--export-all-symbols \$(top_builddir)/src/libspreadsheet.la -s"
-    ;;
-esac
-
 with_native_win32=no
 case $host_os in
 mingw* | pw32*)
@@ -275,7 +257,7 @@
 esac
 AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
 AM_CONDITIONAL(WITH_NATIVE_WIN32, test $with_native_win32 = yes)
-AM_CONDITIONAL(CROSS_COMPILING, test x"$cross_compiling" != "xno")
+AM_CONDITIONAL(CROSS_COMPILING, test x"$cross_compiling" != xno)
 
 GNUMERIC_PLUGIN_LDFLAGS="-avoid-version $GNUMERIC_PLUGIN_LDFLAGS"
 AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
@@ -284,14 +266,14 @@
 if test $gnumeric_devel = yes; then
     CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
     CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
-    if test "x$gnumeric_with_gtk" = "xtrue"; then
+    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
+    if test "x$gnumeric_with_gnome" = xtrue; then
 	    CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
 	    CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
 	    CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
@@ -306,17 +288,17 @@
     enable_hildon="$enableval",
     enable_hildon=no)
 
-if test "x$enable_hildon" = "xyes" ; then
+if test "x$enable_hildon" = xyes ; then
     PKG_CHECK_MODULES(HILDON,
                       hildon-libs hildon-fm libosso,
                       HAVE_HILDON=yes, HAVE_HILDON=no)
 fi
 
-if test "x$HAVE_HILDON" = "xyes" ; then
+if test "x$HAVE_HILDON" = xyes ; then
     AC_DEFINE(GNM_USE_HILDON, 1, [Build with Maemo/Hildon support])
 fi
 
-AM_CONDITIONAL(USE_HILDON, test "x$HAVE_HILDON" = "xyes")
+AM_CONDITIONAL(USE_HILDON, test "x$HAVE_HILDON" = xyes)
 AC_SUBST(HILDON_CFLAGS)
 AC_SUBST(HILDON_LIBS)
 
@@ -329,7 +311,7 @@
 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
 
 with_corba=false
-if test "x${gnumeric_with_gnome}" = "xtrue"; then
+if test "x${gnumeric_with_gnome}" = xtrue; then
 
 	dnl ==============================================
 	dnl Special GConf section  (stolen from libgnome)
@@ -352,7 +334,7 @@
 		bonobo-activation-2.0 >= 1.0.2],
 		[with_corba=true],
 		[with_corba=false])
-	if test "x$with_corba" = "xtrue" ; then
+	if test "x$with_corba" = xtrue ; then
 		ORBIT="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 		BONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
 		BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
@@ -379,7 +361,7 @@
 	[]
 )
 set_more_warnings=yes
-if test "$GCC" = "yes" -a "x$set_more_warnings" != "xno"; then
+if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
 	for option in -Wsign-compare -Wpointer-arith -Wnested-externs -Wchar-subscripts -Wwrite-strings -Wdeclaration-after-statement -Wnested-externs -Wmissing-noreturn -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-pointer-sign \
 	-Wbitwise -Wcast-to-as -Wdefault-bitfield-sign -Wdo-while -Wparen-string -Wptr-subtraction-blows -Wreturn-void -Wtypesign ; do
 		SAVE_CFLAGS="$CFLAGS"
@@ -402,17 +384,17 @@
 AC_ARG_ENABLE(ssconvert,
   [--disable-ssconvert		Do not build ssconvert (command line spreadsheet conversion tool)],
   [], [enable_ssconvert=yes])
-AM_CONDITIONAL(ENABLE_SSCONVERT, test x"$enable_ssconvert" = "xyes")
+AM_CONDITIONAL(ENABLE_SSCONVERT, test x"$enable_ssconvert" = xyes)
 
 AC_ARG_ENABLE(ssindex,
   [--disable-ssindex		Do not build ssindex (spreadsheet indexer for beagle)],
   [], [enable_ssindex=yes])
-AM_CONDITIONAL(ENABLE_SSINDEX, test x"$enable_ssindex" = "xyes")
+AM_CONDITIONAL(ENABLE_SSINDEX, test x"$enable_ssindex" = xyes)
 
 AC_ARG_ENABLE(ssgrep,
   [--disable-ssgrep		Do not build ssgrep (search for supplied strings in spreadsheet)],
   [], [enable_ssgrep=yes])
-AM_CONDITIONAL(ENABLE_SSGREP, test x"$enable_ssgrep" = "xyes")
+AM_CONDITIONAL(ENABLE_SSGREP, test x"$enable_ssgrep" = xyes)
 
 dnl ****************************
 dnl GDA Plugin
@@ -427,52 +409,28 @@
 		gda_msg="Disabled by request"
 	fi
 )
-if test "$try_gda" = "true"; then
+if test "$try_gda" = true; then
 	PKG_CHECK_MODULES(GDA, [libgda-3.0 >= 3.1.1],
 		[gda_msg=yes],
 		[gda_msg="NO.  libgda problem"])
-	if test "$gda_msg" = "yes"; then
+	if test "$gda_msg" = yes; then
 		PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-3.0 >= 3.0.1],
 			[gnomedb_msg="yes"],
 			[gnomedb_msg="NO. libgnomedb problem"])
-		if test "$gnomedb_msg" = "yes"; then
+		if test "$gnomedb_msg" = yes; then
 			AC_DEFINE(HAVE_LIBGNOMEDB, 1, [ Define if libgnomedb support is compiled in])
 		fi
 	fi
 fi
-AM_CONDITIONAL(WITH_GDA, test x"$gda_msg" = "xyes")
+AM_CONDITIONAL(WITH_GDA, test x"$gda_msg" = xyes)
 AC_SUBST(GDA_CFLAGS)
 AC_SUBST(GDA_LIBS)
 
-AM_CONDITIONAL(WITH_GNOMEDB, test x"$gnomedb_msg" = "xyes")
+AM_CONDITIONAL(WITH_GNOMEDB, test x"$gnomedb_msg" = xyes)
 AC_SUBST(GNOMEDB_CFLAGS)
 AC_SUBST(GNOMEDB_LIBS)
 
 dnl ****************************
-dnl GB Plugin
-dnl ****************************
-#try_gda=true
-#gb_msg=yes
-try_gb=no
-gb_msg="disabled due to lack of gb maintenance"
-AC_ARG_WITH(gb,
-	[--{with,without}-gb       Compile the Gnome Basic plugin],
-	if test "x$withval" = xyes; then
-		#try_gb=true
-		gb_msg="We are not joking.  There is no upstream maintainer for GB"
-		#gb_msg="Disabled by request"
-	fi
-)
-if test "$try_gb" = "true"; then
-	PKG_CHECK_MODULES(GB, [libgb == 1.17],
-		[gb_msg=yes],
-		[gb_msg="NO.  gb problem"])
-fi
-AM_CONDITIONAL(WITH_GB, test x"$gb_msg" = "xyes")
-AC_SUBST(GB_CFLAGS)
-AC_SUBST(GB_LIBS)
-
-dnl ****************************
 
 AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
 
@@ -580,7 +538,7 @@
 else
     psiconv_msg=no
 fi
-AM_CONDITIONAL(WITH_PSICONV, test "x$psiconv_msg" = "xyes")
+AM_CONDITIONAL(WITH_PSICONV, test "x$psiconv_msg" = xyes)
 AC_SUBST(PSICONV_LIBS)
 AC_SUBST(PSICONV_CFLAGS)
 
@@ -600,7 +558,7 @@
 		[paradox_msg="missing dependencies"])
 fi
 
-if test "x$paradox_msg" = "xyes"; then
+if test "x$paradox_msg" = xyes; then
 	enable_paradox=true
 fi
 AM_CONDITIONAL(WITH_PARADOX, $enable_paradox)
@@ -898,7 +856,7 @@
      major_ver=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:1])'`]
     if test "x$major_ver" = "x2"; then
 	AC_MSG_RESULT(yes)
-	if test "x$with_native_win32" = "xyes" ; then
+	if test "x$with_native_win32" = xyes ; then
 	    # 2.x on linux, 2x on win32
 	    PY_VERSION=`echo $PY_VERSION | sed -e 's/\\.//'`
 	fi
@@ -913,7 +871,7 @@
 	PY_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.prefix)'`
     fi
     if test "x$PY_INCLUDE_DIR" = x; then
-	if test "x$with_native_win32" = "xyes" ; then
+	if test "x$with_native_win32" = xyes ; then
 	    PY_INCLUDE_DIR="$PY_PREFIX/include"
 	else
 	    PY_INCLUDE_DIR=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys.stdout.write(distutils.sysconfig.get_python_inc())'`
@@ -938,7 +896,7 @@
 AM_CONDITIONAL(WITH_PYTHON, test "x$python_msg" = xyes)
 if test "x$python_msg" = xyes; then
     if test "x$PY_LIB_DIR" = x; then
-	if test "x$with_native_win32" = "xyes" ; then
+	if test "x$with_native_win32" = xyes ; then
 	    PY_LIB_DIR="$PY_PREFIX/libs"
 	else
 	    PY_LIB_DIR=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys.stdout.write(distutils.sysconfig.get_config_var("LIBPL"))'`
@@ -959,7 +917,7 @@
   [enable_pdfdocs=$enableval],
   [enable_pdfdocs=no])
 pdf_msg="No, not requested.";
-if test x"$enable_pdfdocs" = "xyes"; then
+if test x"$enable_pdfdocs" = xyes; then
 	pdfroute=""
 	AC_CHECK_PROG(DBCONTEXT, [dbcontext], [dbcontext], [])
 	AC_CHECK_PROG(DBLATEX, [dblatex], [dblatex], [])
@@ -984,7 +942,7 @@
 		exit 1	
 	fi
 fi
-AM_CONDITIONAL(ENABLE_PDFDOCS, test x"$enable_pdfdocs" = "xyes")
+AM_CONDITIONAL(ENABLE_PDFDOCS, test x"$enable_pdfdocs" = xyes)
 AM_CONDITIONAL(ENABLE_PDF_VIA_DBCONTEXT, test x"$pdfroute" = x"dbcontext")
 AM_CONDITIONAL(ENABLE_PDF_VIA_DBLATEX, test x"$pdfroute" = x"dblatex")
 
@@ -1008,7 +966,7 @@
     mono_msg=$with_mono
     ;;
 esac
-AM_CONDITIONAL(WITH_MONO, test "x$with_mono" = "xyes")
+AM_CONDITIONAL(WITH_MONO, test "x$with_mono" = xyes)
 AC_SUBST(MONO_CFLAGS)
 AC_SUBST(MONO_LIBS)
 ])

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Wed Nov  5 21:25:04 2008
@@ -7,8 +7,6 @@
 src/dialogs/pivottable.glade
 #
 # and these are no longer in use:
-plugins/gb/plugin.c
-plugins/gb/plugin.xml.in
 plugins/guile/plugin.c
 plugins/guile/plugin.xml.in
 plugins/guile/smob-value.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]