- Renamed our detected libreadline version in order to avoid conflicts

  with Chat Rameys (still broken) macros and future CPP definitions in
  libreadline's headers.  Oh what a pain in the ass!

diff --git a/NEWS b/NEWS
index f778271c4a385d9c385f0f9ed6af0d21505b3888..089e06c9445301b974a4569fe7872d4c61cb3dd4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 This file records noteworthy changes.
 
 This file records noteworthy changes.
 

-0.8.3 (10 May 2001)
+0.8.3 (11 May 2001)

 * color and clifford classes are functional and documented.
 * New "spinidx" class for dotted/undotted indices.
 * Predefined spinor metric tensor (created by spinor_metric()).
 * color and clifford classes are functional and documented.
 * New "spinidx" class for dotted/undotted indices.
 * Predefined spinor metric tensor (created by spinor_metric()).

diff --git a/acconfig.h b/acconfig.h
index cac25acaf978ddfa4a1988e94b83ea1d3c47ba18..c73dd6c13bd5e547cf89f8764822e654e4f8e028 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -26,12 +26,6 @@
 /* GiNaC archive file version age.  */
 #undef ARCHIVE_AGE
 
 /* GiNaC archive file version age.  */
 #undef ARCHIVE_AGE
 

-/* Major version of libreadline.  */
-#undef GINAC_RLVERSION_MAJOR
-
-/* Minor version of libreadline.  */
-#undef GINAC_RLVERSION_MINOR
-

 \f
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
 \f
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

diff --git a/acinclude.m4 b/acinclude.m4
index 68f75b2f2519dfc035aab8f1963600c8c3ded000..12350184e76403c573c38cd4fb136e4185f5bee5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -10,7 +10,7 @@ dnl about compatiblilty (which is not so bad by itself) and at the same time
 dnl they don't export the version to the preprocessor so we could kluge around 
 dnl incomatiblities.  The only reliable way to figure out the version is by 
 dnl checking the extern variable rl_library_version at runtime.  &#@$%*!
 dnl they don't export the version to the preprocessor so we could kluge around 
 dnl incomatiblities.  The only reliable way to figure out the version is by 
 dnl checking the extern variable rl_library_version at runtime.  &#@$%*!

-AC_DEFUN(GINAC_RLVERSION,
+AC_DEFUN(GINAC_LIB_READLINE_VERSION,

 [AC_CACHE_CHECK([for version of libreadline], ginac_cv_rlversion, [
 AC_TRY_RUN([
 #include <stdio.h>
 [AC_CACHE_CHECK([for version of libreadline], ginac_cv_rlversion, [
 AC_TRY_RUN([
 #include <stdio.h>


@@ -26,10 +26,10 @@ main()
     exit(0);
 }], ginac_cv_rlversion=`cat 'conftest.out'`, ginac_cv_rlversion='unknown', ginac_cv_rlversion='4.2')
 if test "x${ginac_cv_rlversion}" != "xunknown"; then
     exit(0);
 }], ginac_cv_rlversion=`cat 'conftest.out'`, ginac_cv_rlversion='unknown', ginac_cv_rlversion='4.2')
 if test "x${ginac_cv_rlversion}" != "xunknown"; then

-  RLVERSION_MAJOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\1/'`
-  AC_DEFINE_UNQUOTED(GINAC_RLVERSION_MAJOR, $RLVERSION_MAJOR)
-  RLVERSION_MINOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\2/'`
-  AC_DEFINE_UNQUOTED(GINAC_RLVERSION_MINOR, $RLVERSION_MINOR)
+  RL_VERSION_MAJOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\1/'`
+  AC_DEFINE_UNQUOTED(GINAC_RL_VERSION_MAJOR, $RL_VERSION_MAJOR, [Major version of installed readline library.])
+  RL_VERSION_MINOR=`echo ${ginac_cv_rlversion} | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\2/'`
+  AC_DEFINE_UNQUOTED(GINAC_RL_VERSION_MINOR, $RL_VERSION_MINOR, [Minor version of installed readline library.])

 else
   GINAC_WARNING([I could not run a test of libreadline (needed for building ginsh ginsh).])
 fi
 else
   GINAC_WARNING([I could not run a test of libreadline (needed for building ginsh ginsh).])
 fi

diff --git a/configure.in b/configure.in
index 3ac2f1e2fe5ed0477fb219639f30491908f432f5..c4f45821d1a9892350da892a6d0e24f794e9e359 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ save_LIBS=$LIBS
 LIBS="$LIBTERMCAP $LIBS"
 AC_CHECK_LIB(readline, readline)
 if test "x${ac_cv_lib_readline_readline}" = "xyes"; then
 LIBS="$LIBTERMCAP $LIBS"
 AC_CHECK_LIB(readline, readline)
 if test "x${ac_cv_lib_readline_readline}" = "xyes"; then

-  GINAC_RLVERSION
+  GINAC_LIB_READLINE_VERSION

 else
   GINAC_WARNING([I could not find libreadline (needed by ginsh).])
 fi
 else
   GINAC_WARNING([I could not find libreadline (needed by ginsh).])
 fi

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index ee4e4360c161eb17db53a43e8289c4e37da97506..3f862bda0a6acfdf19a1616f7fa296f50c052204 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -44,7 +44,7 @@
 
 // Original readline settings
 static int orig_completion_append_character;
 
 // Original readline settings
 static int orig_completion_append_character;

-#if (GINAC_RLVERSION_MAJOR < 4) || (GINAC_RLVERSION_MAJOR == 4 && GINAC_RLVERSION_MINOR < 2)
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)

 static char *orig_basic_word_break_characters;
 #else
 static const char *orig_basic_word_break_characters;
 static char *orig_basic_word_break_characters;
 #else
 static const char *orig_basic_word_break_characters;


@@ -706,7 +706,7 @@ static char **fcn_completion(char *text, int start, int end)
                rl_completion_append_character = orig_completion_append_character;
                rl_basic_word_break_characters = orig_basic_word_break_characters;
                rl_completer_word_break_characters = rl_basic_word_break_characters;
                rl_completion_append_character = orig_completion_append_character;
                rl_basic_word_break_characters = orig_basic_word_break_characters;
                rl_completer_word_break_characters = rl_basic_word_break_characters;

-#if (GINAC_RLVERSION_MAJOR < 4) || (GINAC_RLVERSION_MAJOR == 4 && GINAC_RLVERSION_MINOR < 2)
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)

                return completion_matches(text, (CPFunction *)filename_completion_function);
 #else
                return rl_completion_matches(text, (CPFunction *)rl_filename_completion_function);
                return completion_matches(text, (CPFunction *)filename_completion_function);
 #else
                return rl_completion_matches(text, (CPFunction *)rl_filename_completion_function);


@@ -716,7 +716,7 @@ static char **fcn_completion(char *text, int start, int end)
                rl_completion_append_character = '(';
                rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
                rl_completer_word_break_characters = rl_basic_word_break_characters;
                rl_completion_append_character = '(';
                rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
                rl_completer_word_break_characters = rl_basic_word_break_characters;

-#if (GINAC_RLVERSION_MAJOR < 4) || (GINAC_RLVERSION_MAJOR == 4 && GINAC_RLVERSION_MINOR < 2)
+#if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)

                return completion_matches(text, (CPFunction *)fcn_generator);
 #else
                return rl_completion_matches(text, (CPFunction *)fcn_generator);
                return completion_matches(text, (CPFunction *)fcn_generator);
 #else
                return rl_completion_matches(text, (CPFunction *)fcn_generator);