Remove unused guile references in various source files

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22642 57a11ea4-9604-0410-9ed3-97b8803252fd
Gnucash · Dec 12, 2012 · 47778a8 · 47778a8
1 parent a9a6d36
commit 47778a8
Show file tree

Hide file tree

Showing 32 changed files with 4 additions and 287 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1055,8 +1055,6 @@ case $host_os in
     ;;
 esac
 
-#AC_REPLACE_FUNCS(scm_strptime)
-
 if test x$am_cv_val_LC_MESSAGES = "xno"; then
   LC_MESSAGES_ENUM="LC_ALL"
 else

diff --git a/lib/libc/Makefile.am b/lib/libc/Makefile.am
@@ -29,10 +29,6 @@ if OS_WIN32
   AM_CPPFLAGS = -DOS_WIN32
 endif
 
-# Not currently used.  If added to AC_REPLACE_FUNCS then this line
-# should be removed.
-EXTRA_DIST = scm_strptime.c
-
 print_libobjs: Makefile
 	@echo "LIBOBJS = $(LIBOBJS)"
 	@echo "LTLIBOBJS = $(LTLIBOBJS)"
diff --git a/lib/libc/scm_strptime.c b/lib/libc/scm_strptime.c
diff --git a/src/backend/xml/sixtp-dom-generators.c b/src/backend/xml/sixtp-dom-generators.c
@@ -226,21 +226,8 @@ gchar*
 double_to_string(double value)
 {
     gchar *numstr;
-#ifdef USE_GUILE_FOR_DOUBLE_CONVERSION
-    numstr = gh_scm2newstr(scm_call_1(scm_c_eval_string("number->string"),
-                                      scm_make_real(value)),
-                           NULL);
-
-#else /* don't USE_GUILE_FOR_DOUBLE_CONVERSION */
-    /*
-     * we're just going to use plain-old libc for the double conversion.
-     * There was some question as to whether libc is accurate enough
-     * in its printf function for doubles, but I don't understand
-     * how it couldn't be ...
-     */
     numstr = g_strdup_printf ("%24.18g", value);
 
-#endif /* USE_GUILE_FOR_DOUBLE_CONVERSION */
     if (!numstr)
     {
         return NULL;

diff --git a/src/backend/xml/sixtp-utils.c b/src/backend/xml/sixtp-utils.c
@@ -141,66 +141,18 @@ concatenate_child_result_chars(GSList *data_from_children)
 
 /*********/
 /* double
-
-   RLB writes:
-   We have to use guile because AFAICT, libc, and C in general isn't
-   smart enough to actually parse it's own output, especially not
-   portably (big surprise).
-
-   Linas writes:
-   I don't understand the claim; I'm just going to use
-   atof or strtod to accomplish this.
-
-   RLB writes: FIXME: OK, but at the very least this may cause a
-   locale dependency.  Whoever fixes that, please delete this whole
-   comment block.
-
  */
 
 gboolean
 string_to_double(const char *str, double *result)
 {
+    char *endptr = 0x0;
+
     g_return_val_if_fail(str, FALSE);
     g_return_val_if_fail(result, FALSE);
 
-#ifdef USE_GUILE_FOR_DOUBLE_CONVERSION
-    {
-        /* FIXME: NOT THREAD SAFE - USES STATIC DATA */
-        static SCM string_to_number;
-        static gboolean ready = FALSE;
-
-        SCM conversion_result;
-
-        if (!ready)
-        {
-            string_to_number = scm_c_eval_string("string->number");
-            scm_gc_protect_object(string_to_number);
-            ready = TRUE;
-        }
-
-        conversion_result = scm_call_1(string_to_number, scm_makfrom0str(str));
-        if (!conversion_result == SCM_BOOL_F)
-        {
-            return(FALSE);
-        }
-
-        *result = scm_num2dbl(conversion_result, G_STRFUNC);
-    }
-
-#else /* don't USE_GUILE_FOR_DOUBLE_CONVERSION */
-    {
-        char *endptr = 0x0;
-
-        /* We're just going to use plain-old libc for the double conversion.
-         * There was some question as to whether libc is accurate enough
-         * in its printf function for doubles, but I don't understand
-         * how it couldn't be ...
-         */
-
-        *result = strtod (str, &endptr);
-        if (endptr == str) return (FALSE);
-    }
-#endif /* USE_GUILE_FOR_DOUBLE_CONVERSION */
+    *result = strtod (str, &endptr);
+    if (endptr == str) return (FALSE);
 
     return(TRUE);
 }

diff --git a/src/backend/xml/test/test-xml-commodity.c b/src/backend/xml/test/test-xml-commodity.c
@@ -2,7 +2,6 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <libguile.h>
 #include <stdlib.h>
 #include <unistd.h>
 

diff --git a/src/business/business-ledger/Makefile.am b/src/business/business-ledger/Makefile.am
@@ -26,7 +26,6 @@ libgnc_business_ledger_la_LIBADD = \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GTK_LIBS} \
-  ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
@@ -38,7 +37,6 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
   ${GCONF_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}

diff --git a/src/business/business-ledger/gncEntryLedgerLoad.c b/src/business/business-ledger/gncEntryLedgerLoad.c
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <libguile.h>
 
 #include "Account.h"
 #include "account-quickfill.h"

diff --git a/src/gnc/CMakeLists.txt b/src/gnc/CMakeLists.txt
@@ -7,7 +7,6 @@ LINK_DIRECTORIES (${GLIB2_LIBRARY_DIRS}
   ${GOBJECT_LIBRARY_DIRS}
   ${GTHREAD_LIBRARY_DIRS}
   ${GCONF2_LIBRARY_DIRS}
-  ${GUILE_LIBRARY_DIRS}
   ${GLIBMM_LIBRARY_DIRS}
 #  ${GWENHYWFAR_LIBRARY_DIRS}
 #  ${AQBANKING_LIBRARY_DIRS}
@@ -81,7 +80,6 @@ INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${GLIBMM_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h
@@ -121,7 +119,6 @@ TARGET_LINK_LIBRARIES (cutecash engine gnc-module core-utils qof)
 TARGET_LINK_LIBRARIES (cutecash ${GLIBMM_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${GCONF2_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${GTHREAD_LIBRARIES} ${GOBJECT_LIBRARIES} ${GMODULE_LIBRARIES} ${GLIB2_LIBRARIES})
-TARGET_LINK_LIBRARIES (cutecash ${GUILE_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${LIBXML2_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${ZLIB_LIBRARIES})
 IF (WIN32)

diff --git a/src/gnc/main.cpp b/src/gnc/main.cpp
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libguile.h>
 #include <glib/gi18n.h>
 #include <glib.h>
 extern "C"

diff --git a/src/gnome-search/gncmod-gnome-search.c b/src/gnome-search/gncmod-gnome-search.c
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <gmodule.h>
-#include <libguile.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"

diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <errno.h>
-#include <libguile.h>
 #include <string.h>
 
 #include "dialog-utils.h"

diff --git a/src/gnome-utils/gnc-gnome-utils.c b/src/gnome-utils/gnc-gnome-utils.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <libguile.h>
 #include <gconf/gconf.h>
 #ifdef HAVE_X11_XLIB_H
 # include <X11/Xlib.h>

diff --git a/src/gnome/dialog-new-user.c b/src/gnome/dialog-new-user.c
@@ -24,7 +24,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libguile.h>
 
 #include "dialog-new-user.h"
 #include "dialog-utils.h"