From fd04c906c8fae146c91992904152bce315e9404d Mon Sep 17 00:00:00 2001
From: whydoubt <whydoubt>
Date: Mon, 25 Oct 2004 04:11:13 +0000
Subject: [PATCH] Readline usage fixes

---
 ChangeLog              |  7 +++++++
 configure.in           |  2 --
 src/gmdb2/Makefile.am  |  2 +-
 src/libmdb/Makefile.am |  2 +-
 src/util/Makefile.am   |  2 +-
 src/util/mdb-sql.c     | 33 ++++++++++++++++-----------------
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6003c2a..de3d7d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct 24 23:07:16 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
+	* configure.in:
+	* src/gmdb2/Makefile.am:
+	* src/libmdb/Makefile.am:
+	* src/util/Makefile.am:
+	* src/util/mdb-sql.c: Readline usage fixes
+
 Wed Oct 20 21:49:04 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
 	* src/sql/mdbsql.c: Get rid of GLib 2.4+ call
 
diff --git a/configure.in b/configure.in
index c478280..cd05247 100644
--- a/configure.in
+++ b/configure.in
@@ -168,8 +168,6 @@ dnl Checks for library functions.
 OLDLDFLAGS=$LDFLAGS
 
 VL_LIB_READLINE
-READLINE_LIBS=$vl_cv_lib_readline
-AC_SUBST(READLINE_LIBS)
 
 LDFLAGS=$OLDLDFLAGS
 
diff --git a/src/gmdb2/Makefile.am b/src/gmdb2/Makefile.am
index 88b7699..a06dd7e 100644
--- a/src/gmdb2/Makefile.am
+++ b/src/gmdb2/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = help gladefiles pixmaps
 bin_PROGRAMS	= gmdb2 
 include_HEADERS = gmdb.h
 gmdb2_SOURCES = main2.c file.c util.c table.c query.c module.c macro.c report.c form.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
-LIBS =	-rdynamic $(GNOME_LIBS) @LEXLIB@ 
+LIBS = -rdynamic $(GNOME_LIBS) @LIBS@ @LEXLIB@ 
 AM_CPPFLAGS	=	-I$(top_srcdir)/include \
 	$(GNOME_CFLAGS) \
         -DDATADIR=\""$(datadir)"\"                      \
diff --git a/src/libmdb/Makefile.am b/src/libmdb/Makefile.am
index 18919f2..4f9cc98 100644
--- a/src/libmdb/Makefile.am
+++ b/src/libmdb/Makefile.am
@@ -2,4 +2,4 @@ lib_LTLIBRARIES	=	libmdb.la
 libmdb_la_SOURCES=	catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c
 libmdb_la_LDFLAGS = -version-info  1:0:0
 AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
-LIBS = $(GLIB_LIBS) -lm
+LIBS = $(GLIB_LIBS) @LIBS@ -lm
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 87193f4..a906b81 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,5 +1,5 @@
 bin_PROGRAMS	=	mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver mdb-prop mdb-import prtable prcat prdata prkkd prdump prole updrow prindex
-LIBS	=	$(GLIB_LIBS) $(READLINE_LIBS) @LEXLIB@ 
+LIBS	=	$(GLIB_LIBS) @LIBS@ @LEXLIB@ 
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
 AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
diff --git a/src/util/mdb-sql.c b/src/util/mdb-sql.c
index b808ba9..a1c6fc9 100644
--- a/src/util/mdb-sql.c
+++ b/src/util/mdb-sql.c
@@ -25,12 +25,11 @@
 #    include <readline/readline.h>
 #  elif defined(HAVE_READLINE_H)
 #    include <readline.h>
-#  else /* !defined(HAVE_READLINE_H) */
+#  else
+/* no readline.h */
 extern char *readline ();
-#  endif /* !defined(HAVE_READLINE_H) */
+#  endif
 char *cmdline = NULL;
-#else /* !defined(HAVE_READLINE_READLINE_H) */
-/* no readline */
 #endif /* HAVE_LIBREADLINE */
 
 #ifdef HAVE_READLINE_HISTORY
@@ -38,12 +37,12 @@ char *cmdline = NULL;
 #    include <readline/history.h>
 #  elif defined(HAVE_HISTORY_H)
 #    include <history.h>
-#  else /* !defined(HAVE_HISTORY_H) */
+#  else
+/* no history.h */
 extern void add_history ();
 extern int write_history ();
 extern int read_history ();
-#  endif /* defined(HAVE_READLINE_HISTORY_H) */
-/* no history */
+#  endif
 #endif /* HAVE_READLINE_HISTORY */
 
 #include <string.h>
@@ -66,7 +65,9 @@ char *delimiter;
 int showplan = 0;
 int noexec = 0;
 
+#ifdef HAVE_READLINE_HISTORY
 #define HISTFILE ".mdbhistory"
+#endif
 
 #ifndef HAVE_LIBREADLINE
 char *readline(char *prompt)
@@ -89,16 +90,6 @@ int i = 0;
 
 	return buf;
 }
-void add_history(char *s)
-{
-}
-void read_history(char *s)
-{
-}
-void write_history(char *s)
-{
-}
-
 #endif
 
 int parse(MdbSQL *sql, char *buf)
@@ -190,8 +181,10 @@ read_file(char *s, int line, unsigned int *bufsz, char *mybuf)
 			mybuf = (char *) realloc(mybuf, *bufsz);
 		}	
 		strcat(mybuf, buf);
+#ifdef HAVE_READLINE_HISTORY
 		/* don't record blank lines */
 		if (strlen(buf)) add_history(buf);
+#endif
 		strcat(mybuf, "\n");
 		lines++;
 		printf("%d => %s",line+lines, buf);
@@ -375,11 +368,13 @@ char *home = getenv("HOME");
 char *histpath;
 
 
+#ifdef HAVE_READLINE_HISTORY
 	if (home) {
 		histpath = (char *) g_strconcat(home, "/", HISTFILE, NULL);
 		read_history(histpath);
 		g_free(histpath);
 	}
+#endif
 	if (!isatty(fileno(stdin))) {
 		in = stdin;
 	}
@@ -462,8 +457,10 @@ char *histpath;
 				bufsz *= 2;
 				mybuf = (char *) g_realloc(mybuf, bufsz);
 			}
+#ifdef HAVE_READLINE_HISTORY
 			/* don't record blank lines */
 			if (strlen(s)) add_history(s);
+#endif
 			strcat(mybuf,s);
 			/* preserve line numbering for the parser */
 			strcat(mybuf,"\n");
@@ -494,11 +491,13 @@ char *histpath;
 	g_free(mybuf);
 	if (s) free(s);
 
+#ifdef HAVE_READLINE_HISTORY
 	if (home) {
 		histpath = (char *) g_strconcat(home, "/", HISTFILE, NULL);
 		write_history(histpath);
 		g_free(histpath);
 	}
+#endif
 
 	myexit(0);