RISC OS changes due to dynload removal

4 files changed, 24 insertions, 9 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 99fd66604..41145b026 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-03  Stefan Bellon  <sbellon@sbellon.de>
+
+	* conf-riscos/include/g10defs.h: Added GNUPG_LIBEXECDIR.
+
+	* conf-riscos/include/config.h: Changes due to dynload removal and
+	minor changes to avoid some warnings.
+
+	* conf-riscos/Makefile: Changes due to dynload removal.
+
 2002-07-25  David Shaw  <dshaw@jabberwocky.com>
 
 	* gnupgbug: "Warning" -> "WARNING"
diff --git a/scripts/conf-riscos/Makefile b/scripts/conf-riscos/Makefile
index 3461fa196..eeb6206c6 100644
--- a/scripts/conf-riscos/Makefile
+++ b/scripts/conf-riscos/Makefile
@@ -5,13 +5,12 @@ AS=objasm
 MAKE=amu
 DEPEND=-depend !Depend
 LIBLDAP=^.^.openldap-2/0/18
-CC_FLAGS=-Wp -apcs 3/26bit/fpe2 -throwback -Otime -IUnix:,include,mpi,intl,zlib,$(LIBLDAP).include -JUnix: -D__riscos__ -DHAVE_CONFIG_H -DNO_ASM -UIS_MODULE -DVERSION="\"$(GnuPG$Version)\"" $(GnuPG$DevDefine)
-AS_FLAGS=-apcs 3/26bit/fpe2 -throwback -predefine "ARMv4 SETA 0"
+CC_FLAGS=-Wpc -apcs 3/26bit/fpe2 -throwback -Otime -IUnix:,include,mpi,intl,zlib,$(LIBLDAP).include -JUnix: -D__riscos__ -DHAVE_CONFIG_H -DNO_ASM -UIS_MODULE -DVERSION="\"$(GnuPG$Version)\"" $(GnuPG$DevDefine)
+AS_FLAGS=-apcs 3/26bit -throwback -predefine "ARMv4 SETA 0"
 LD_FLAGS=Unix:o.unixlib
 CIPHER_OBJS=cipher.o.blowfish \
 	cipher.o.cast5 \
 	cipher.o.cipher \
-	cipher.o.construct \
 	cipher.o.des \
 	cipher.o.dsa \
 	cipher.o.dynload \
@@ -170,15 +169,17 @@ GPGV_OBJS=g10.o.armor \
 	util.o.secmem \
 	util.o.strgutil \
 	util.o.riscos \
-	cipher.o.constructv \
 	cipher.o.dsa \
 	cipher.o.dynload \
 	cipher.o.elgamal \
 	cipher.o.g10c \
 	cipher.o.md \
+	cipher.o.md5 \
 	cipher.o.pubkey \
 	cipher.o.rmd160 \
 	cipher.o.rsa \
+	cipher.o.sha1 \
+	cipher.o.tiger32 \
 	mpi.mpi \
 	zlib.zlib
 GPGKEYS_OBJS=util.o.riscos \
@@ -375,7 +376,7 @@ clean-g10:
 	-ifthere g10.o.* then wipe g10.o.* ~CFR~V
 
 clean-keyserver:
-	-ifthere keyserver.gpgkeys_* then wipe keyserver.gpgkeys_* ~CFR~V
+	-ifthere keyserver.gpgkeys_ldap then wipe keyserver.gpgkeys_ldap ~CFR~V
 	-ifthere keyserver.o.* then wipe keyserver.o.* ~CFR~V
 
 clean-tools:
diff --git a/scripts/conf-riscos/include/config.h b/scripts/conf-riscos/include/config.h
index 6a3440235..faa7fe852 100644
--- a/scripts/conf-riscos/include/config.h
+++ b/scripts/conf-riscos/include/config.h
@@ -84,16 +84,16 @@
 #define PRINTABLE_OS_NAME "RISC OS"
 
 /* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
+#define HAVE_LC_MESSAGES
 
 /* Define to 1 if NLS is requested.  */
 #define ENABLE_NLS 1
 
 /* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
+#define HAVE_CATGETS 0
 
 /* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
+#define HAVE_GETTEXT 0
 
 #undef BIG_ENDIAN_HOST
 #define LITTLE_ENDIAN_HOST 1
@@ -175,7 +175,7 @@
 #undef HAVE_CLOCK_GETTIME
 
 /* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
+#define HAVE_DCGETTEXT 0
 
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
@@ -367,9 +367,13 @@
   #define M_GUARD
 #endif
 
+#define USE_RNDRISCOS
 
 /* RISC OS specifica */
 #if (__CC_NORCROFT == 1) /* Norcroft */
+# undef __GNUC__
+# define __GNUC_MINOR__ 0
+# define __GLIBC__ 0
 # define __attribute__(x) 
 # if (__CC_NORCROFT_VERSION < 544) /* old version of Norcroft */
 #  define inline __inline
diff --git a/scripts/conf-riscos/include/g10defs.h b/scripts/conf-riscos/include/g10defs.h
index a02dff42a..46acdbfe1 100644
--- a/scripts/conf-riscos/include/g10defs.h
+++ b/scripts/conf-riscos/include/g10defs.h
@@ -21,6 +21,7 @@
 /* Path variables and filing system constants for RISC OS */
 #define G10_LOCALEDIR     "<GnuPG$Dir>.locale"
 #define GNUPG_LIBDIR      "<GnuPG$Dir>"
+#define GNUPG_LIBEXECDIR  "<GnuPG$Dir>"
 #define GNUPG_DATADIR     "<GnuPG$Dir>"
 #define GNUPG_HOMEDIR     "<GnuPGUser$Dir>"
 #define LOCALE_ALIAS_PATH "<GnuPG$Dir>.locale"