Autoconf updates. Fixes for compiler warnings.

andysan · Feb 9, 2007 · b988a47 · b988a47
1 parent bdccab0
commit b988a47
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/configure.in b/configure.in
@@ -32,13 +32,14 @@ if test x$enable_readline != xno; then
    VL_LIB_READLINE
 fi
 
-CFLAGS="$CFLAGS -Wall -Werror"
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile]
-		[pdp12-emu.spec]
-		[libpdp12/Makefile]
-		[libpdp12utils/Makefile]
-		[frontend/Makefile]
-		[frontend/console/Makefile])
+CFLAGS="$CFLAGS $SDL_CFLAGS -Wall -Werror"
+LIBS="$LIBS $SDL_LIBS"
+
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_FILES([Makefile \
+		pdp12-emu.spec \
+		libpdp12/Makefile \
+		libpdp12utils/Makefile \
+		frontend/Makefile \
+		frontend/console/Makefile])
 AC_OUTPUT
diff --git a/frontend/console/readln.h b/frontend/console/readln.h
@@ -31,6 +31,7 @@ extern char *readline ();
 #  endif /* !defined(HAVE_READLINE_H) */
 #else /* !defined(HAVE_READLINE_READLINE_H) */
 /* no readline */
+char* readln_basic(const char* prompt);
 #define readline(p) readln_basic(p)
 #endif /* HAVE_LIBREADLINE */
 

diff --git a/frontend/console/shell.c b/frontend/console/shell.c
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 
 #include <libpdp12/cpu.h>
 #include <libpdp12utils/rim.h>