merge the changes on the branch prepare_0_5_96 to the main trunk.

config.h.in

@@ -27,36 +27,44 @@
 /* Defined if an absolute indirect call/jump must NOT be prefixed with `*'.  */
 #undef ABSOLUTE_WITHOUT_ASTERISK
 
-/* Define if you have the <curses.h> header file.  */
-#undef HAVE_CURSES_H
-
-/* Define if you have the <ncurses.h> header file.  */
-#undef HAVE_NCURSES_H
-
-/* Define if you have the <ncurses/curses.h> header file.  */
-#undef HAVE_NCURSES_CURSES_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if C symbols get an underscore after compilation */
-#undef HAVE_ASM_USCORE
-
 /* Define it to "addr32" or "addr32;" to make GAS happy */
 #undef ADDR32
 
 /* Define it to "data32" or "data32;" to make GAS happy */
 #undef DATA32
 
+/* Define if C symbols get an underscore after compilation */
+#undef HAVE_ASM_USCORE
+
+/* Define if you have the <curses.h> header file. */
+#undef HAVE_CURSES_H
+
+/* Define if you have the `curses' library (-lcurses). */
+#undef HAVE_LIBCURSES
+
+/* Define if you have the `ncurses' library (-lncurses). */
+#undef HAVE_LIBNCURSES
+
+/* Define if you have the `util' library (-lutil). */
+#undef HAVE_LIBUTIL
+
+/* Define if you have the <ncurses/curses.h> header file. */
+#undef HAVE_NCURSES_CURSES_H
+
+/* Define if you have the <ncurses.h> header file. */
+#undef HAVE_NCURSES_H
+
 /* Define if opendisk() in -lutil can be used */
 #undef HAVE_OPENDISK
 
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION