Index: config.h
==================================================================
--- config.h
+++ config.h
@@ -100,11 +100,11 @@
 
 /* Define to 1 if you have the `memset' function. */
 #define HAVE_MEMSET 1
 
 /* Define to 1 if you have the `readline' function. */
-#define HAVE_READLINE 1
+/* #undef HAVE_READLINE */
 
 /* Define to 1 if you have the `sqrt' function. */
 /* #undef HAVE_SQRT */
 
 /* Define to 1 if `stat' has the bug that it succeeds when given the

Index: exif_loader.c
==================================================================
--- exif_loader.c
+++ exif_loader.c
@@ -1615,8 +1615,7 @@
     spatialite_cleanup_ex (cache);
     if (cnt)
 	fprintf (stderr,
 		 "\n\n***   %d EXIF photo%s successfully inserted into the DB\n",
 		 cnt, (cnt > 1) ? "s where" : " was");
-spatialite_shutdown();
     return 0;
 }

Index: shell.c
==================================================================
--- shell.c
+++ shell.c
@@ -117,14 +117,10 @@
 #endif
 
 /* True if the timer is enabled */
 static int enableTimer = 0;
 
-/* sandro 2013-11-07 */
-void *splite_cache = NULL;
-/* end sandro 2013-11-07 */
-
 /* ctype macros that work with signed characters */
 #define IsSpace(X)  isspace((unsigned char)X)
 #define IsDigit(X)  isdigit((unsigned char)X)
 #define ToLower(X)  (char)tolower((unsigned char)X)
 
@@ -265,11 +261,11 @@
 /*
 ** sandro 2013-08-30
 ** If the following flag is set, no welcome message will be
 ** printed at all.
 */
-static int splite_silent = 0;
+static int silent = 0;
 
 /*
 ** Threat stdin as an interactive input if the following variable
 ** is true.  Otherwise, assume stdin is connected to a file or pipe.
 */
@@ -2251,11 +2247,10 @@
     if( db==0 || SQLITE_OK!=sqlite3_errcode(db) ){
       fprintf(stderr,"Error: unable to open database \"%s\": %s\n", 
           p->zDbFilename, sqlite3_errmsg(db));
       exit(1);
     }
-    spatialite_init_ex (p->db, splite_cache, (splite_silent == 0) ? 1 : 0);
 #ifndef SQLITE_OMIT_LOAD_EXTENSION
     sqlite3_enable_load_extension(p->db, 1);
 #endif
 
 /* Sandro Furieri 2009-11-08 */
@@ -2672,11 +2667,11 @@
           dxf = gaiaCreateDxfParser (srid, force_dims, prefix, layer_name,
                 special_rings);
           if (dxf == NULL)
               goto stop_dxf;
       /* attempting to parse the DXF input file */
-          if (gaiaParseDxfFile_r (splite_cache, dxf, dxf_path))
+          if (gaiaParseDxfFile (dxf, dxf_path))
           {
       /* loading into the DB */
               if (!gaiaLoadFromDxfParser (p->db, dxf, mode, append))
                   fprintf (stderr, "DB error while loading: %s\n", dxf_path);
           }
@@ -4111,13 +4106,10 @@
   struct callback_data data;
   const char *zInitFile = 0;
   char *zFirstCmd = 0;
   int i;
   int rc = 0;
-  
-/* initializing the SpatiaLite's internal cache */
-  splite_cache = spatialite_alloc_connection ();
 
   if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
     fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
             sqlite3_sourceid(), SQLITE_SOURCE_ID);
     exit(1);
@@ -4131,12 +4123,14 @@
 2013-08-30: supporting "silent mode"
 */
   for(i=1; i<argc && argv[i][0]=='-'; i++){
     char *z = argv[i];
     if( z[1]=='-' ){ z++; }
-    if( strcmp(z,"-silent")==0 ){ splite_silent = 1;}
+    if( strcmp(z,"-silent")==0 ){ silent = 1;}
 	}
+fprintf(stderr, "silent %d %d\n", silent, (silent == 0) ? 1 : 0);
+    spatialite_init ((silent == 0) ? 1 : 0);
 
   stdin_is_interactive = isatty(0);
 
   /* Make sure we have a valid signal handler early, before anything
   ** else is done.
@@ -4306,11 +4300,11 @@
       data.statsOn = 1;
     }else if( strcmp(z,"-bail")==0 ){
       bail_on_error = 1;
     }else if( strcmp(z,"-silent")==0 ){
 /* sandro 2013-08-30 */
-      splite_silent = 1;
+      silent = 1;
 /* end sandro */
     }else if( strcmp(z,"-version")==0 ){
       printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
       return 0;
     }else if( strcmp(z,"-interactive")==0 ){
@@ -4385,11 +4379,10 @@
         "Enter \".help\" for instructions\n"
         "Enter SQL statements terminated with a \";\"\n",
         sqlite3_libversion(), sqlite3_sourceid()
       );
 */
-     open_db(&data);
      if (isatty (1))
           printf ("SQLite version ......: %s\n",
      sqlite3_libversion ());
      auto_fdo_start (data.db);
      if (isatty (1))
@@ -4438,11 +4431,9 @@
 /*
 Sandro Furieri 30 May 2008
 ===========================
 memory cleanup for SpatiaLite extension
 */
-    
-  spatialite_cleanup_ex (splite_cache);
-  spatialite_shutdown ();
+    sqlite3_reset_auto_extension ();
 
   return rc;
 }

Index: spatialite_convert.c
==================================================================
--- spatialite_convert.c
+++ spatialite_convert.c
@@ -7025,8 +7025,7 @@
   stop:
     fprintf (stderr, "*** ERROR: conversion failed\n");
   end:
     sqlite3_close (handle);
     spatialite_cleanup_ex (cache);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_dxf.c
==================================================================
--- spatialite_dxf.c
+++ spatialite_dxf.c
@@ -478,11 +478,11 @@
     dxf = gaiaCreateDxfParser (srid, force_dims, prefix, selected_layer,
 			       special_rings);
     if (dxf == NULL)
 	goto stop;
 /* attempting to parse the DXF input file */
-    if (gaiaParseDxfFile_r (cache, dxf, dxf_path))
+    if (gaiaParseDxfFile (dxf, dxf_path))
       {
 	  /* loading into the DB */
 	  if (!gaiaLoadFromDxfParser (handle, dxf, mode, append))
 	      fprintf (stderr, "DB error while loading: %s\n", dxf_path);
       }
@@ -539,8 +539,7 @@
 	  if (ret != SQLITE_OK)
 	      fprintf (stderr, "sqlite3_close() error: %s\n",
 		       sqlite3_errmsg (handle));
       }
     spatialite_cleanup_ex (cache);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_gml.c
==================================================================
--- spatialite_gml.c
+++ spatialite_gml.c
@@ -1939,8 +1939,7 @@
 	  printf ("\tIN_MEMORY database succesfully exported\n");
       }
 
     sqlite3_close (handle);
     spatialite_cleanup_ex (cache);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_network.c
==================================================================
--- spatialite_network.c
+++ spatialite_network.c
@@ -2121,8 +2121,7 @@
 	  return -1;
       }
     validate (path, table, from_column, to_column, cost_column, geom_column,
 	      name_column, oneway_tofrom, oneway_fromto, bidirectional,
 	      out_table, force_creation, a_star_supported);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_osm_filter.c
==================================================================
--- spatialite_osm_filter.c
+++ spatialite_osm_filter.c
@@ -1862,8 +1862,7 @@
     free (mask);
     sqlite3_close (handle);
     spatialite_cleanup_ex (cache);
     if (out != NULL)
 	fclose (out);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_osm_map.c
==================================================================
--- spatialite_osm_map.c
+++ spatialite_osm_map.c
@@ -2830,8 +2830,7 @@
 
 /* VACUUMing */
     db_vacuum (handle);
     sqlite3_close (handle);
     spatialite_cleanup_ex (cache);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_osm_net.c
==================================================================
--- spatialite_osm_net.c
+++ spatialite_osm_net.c
@@ -2745,8 +2745,7 @@
 /* VACUUMing */
     db_vacuum (handle);
     sqlite3_close (handle);
     spatialite_cleanup_ex (cache);
     free_params (&params);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_osm_raw.c
==================================================================
--- spatialite_osm_raw.c
+++ spatialite_osm_raw.c
@@ -1223,8 +1223,7 @@
       }
 
 /* closing the DB connection */
     sqlite3_close (handle);
     spatialite_cleanup_ex (cache);
-    spatialite_shutdown ();
     return 0;
 }

Index: spatialite_tool.c
==================================================================
--- spatialite_tool.c
+++ spatialite_tool.c
@@ -537,8 +537,7 @@
     if (import && in_shp)
 	do_import_shp (db_path, shp_path, table, charset, srid, column,
 		       coerce2d, compressed);
     if (export)
 	do_export (db_path, shp_path, table, column, charset, type);
-    spatialite_shutdown ();
     return 0;
 }