Move pr_keys.c to console, fixes missing Key_Progs_Init symbol for dynamic

builds with automake 1.9.

libs/console/Makefile.am

@@ -14,7 +14,7 @@ EXTRA_LTLIBRARIES=  console_server.la console_client.la
 
 common_sources= \
 	buffer.c complete.c console.c inputline.c list.c filelist.c view.c
-client_sources= client.c menu.c
+client_sources= client.c menu.c pr_keys.c
 server_sources= server.c
 
 libQFconsole_la_LDFLAGS=	-version-info 1:0:0 -rpath $(libdir) -no-undefined

libs/console/pr_keys.c

@@ -0,0 +1,150 @@
+/*
+	bi_keys.c
+
+	CSQC key-api builtins
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+static __attribute__ ((unused)) const char rcsid[] = 
+	"$Id$";
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/csqc.h"
+#include "QF/keys.h"
+#include "QF/progs.h"
+#include "QF/zone.h"
+
+/*
+    bi_Key_SetBinding
+    
+    QC-Function for set a binding
+*/
+static void
+bi_Key_SetBinding (progs_t *pr)
+{
+	int	        target  = P_INT (pr, 0);
+	int         keynum  = P_INT (pr, 1);
+	const char *binding = P_GSTRING (pr, 2);
+
+	if (strlen (binding) == 0 || binding[0] == '\0') {
+		binding = NULL;	/* unbind a binding */
+	}
+
+	Key_SetBinding (target, keynum, binding);
+}
+
+/*
+    bi_Key_LookupBinding
+    
+    Perform a reverse-binding-lookup
+*/
+static void
+bi_Key_LookupBinding (progs_t *pr)
+{
+	int	        target  = P_INT (pr, 0);
+	int	        bindnum = P_INT (pr, 1);
+	const char *binding = P_GSTRING (pr, 2);
+	int i;
+	knum_t keynum = -1;
+	const char *keybind = NULL;
+
+	for (i = 0; i < QFK_LAST; i++) {
+		keybind = keybindings[target][i].str;
+		if (keybind == NULL) {
+		  continue;
+		}
+		if (strcmp (keybind, binding) == 0) {
+			bindnum--;
+			if (bindnum == 0) {
+				keynum = i;
+				break;
+			}
+		}
+	}
+
+	R_INT (pr) = keynum;	
+};
+
+/*
+    bi_Key_CountBinding
+    
+    Counts how often a binding is assigned to a key
+*/
+static void
+bi_Key_CountBinding (progs_t *pr)
+{
+	int	        target  = P_INT (pr, 0);
+	const char *binding = P_GSTRING (pr, 1);
+	int i, res = 0;
+	const char *keybind = NULL;
+
+	for (i = 0; i < QFK_LAST; i++) {
+		keybind = keybindings[target][i].str;
+		if (keybind == NULL) {
+		  continue;
+		}
+		if (strcmp (keybind, binding) == 0) {
+			res++;
+		}
+	}
+
+	R_INT (pr) = res;	
+};
+
+
+/*
+    bi_Key_LookupBinding
+    
+    Convertes a keynum to a string
+*/
+static void
+bi_Key_KeynumToString (progs_t *pr)
+{
+	int	        keynum  = P_INT (pr, 0);
+
+	RETURN_STRING (pr, Key_KeynumToString (keynum));
+};
+
+static builtin_t builtins[] = {
+	{"Key_SetBinding",		bi_Key_SetBinding,		-1},
+	{"Key_LookupBinding",	bi_Key_LookupBinding,	-1},
+	{"Key_CountBinding",	bi_Key_CountBinding,	-1},
+	{"Key_KeynumToString",	bi_Key_KeynumToString,	-1},
+// NEED THIS ?//	{"Key_StringToKeynum",	bi_Key_KeynumToString,	-1},
+	{0}
+};
+
+void
+Key_Progs_Init (progs_t *pr)
+{
+	PR_RegisterBuiltins (pr, builtins);
+}

libs/video/targets/Makefile.am

@@ -40,7 +40,7 @@ libQFjs_la_SOURCES=		joy.c $(joy_src)
 EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
 
 libvid_common_la_SOURCES=	\
-		in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c
+		in_common.c in_event.c keys.c old_keys.c vid.c
 libvid_common_la_CFLAGS=	@PREFER_NON_PIC@
 libvid_common_la_LDFLAGS=	@STATIC@