Initial introduction of autoconf support; just endian checking at present.

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index d626ffd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Makefile for onak.
-#
-# $Id: Makefile,v 1.23 2004/05/31 22:04:50 noodles Exp $
-#
-
-CC = gcc
-LINK = gcc
-CFLAGS += -Wall -pedantic -g -I/usr/local/include
-# Uncomment to enable profiling.
-#LDFLAGS += -pg
-# Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
-DBTYPE = db3
-# If using DBTYPE of "file" then comment the following line out.
-#LIBS = -L/usr/local/lib -lpq
-LIBS = -L/usr/local/lib -ldb3
-
-PROGS = add lookup gpgwww onak splitkeys
-CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \
-       keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
-       log.o photoid.o wordlist.o
-OBJS = merge.o stats.o sendsync.o cleankey.o $(CORE_OBJS)
-SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
-       keyindex.c stats.c lookup.c add.c keydb_$(DBTYPE).c ll.c hash.c \
-       gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \
-       wordlist.c cleankey.c
-
-all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
-
-splitkeys: splitkeys.o $(CORE_OBJS)
-       $(LINK) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS)
-
-testparse: main.o $(OBJS)
-       $(LINK) -o testparse main.o $(OBJS) $(LIBS)
-
-maxpath: maxpath.o $(OBJS)
-       $(LINK) -o maxpath maxpath.o $(OBJS) $(LIBS)
-
-sixdegrees: sixdegrees.o $(OBJS)
-       $(LINK) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)
-
-gpgwww: gpgwww.o $(OBJS)
-       $(LINK) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
-
-lookup: lookup.o cleankey.o merge.o $(CORE_OBJS)
-       $(LINK) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) $(LIBS)
-
-add: add.o cleankey.o merge.o sendsync.o $(CORE_OBJS)
-       $(LINK) -o add add.o cleankey.o merge.o sendsync.o $(CORE_OBJS) $(LIBS)
-
-onak: onak.o merge.o cleankey.o $(CORE_OBJS)
-       $(LINK) $(LDFLAGS) -o onak onak.o merge.o cleankey.o $(CORE_OBJS) \
-               $(LIBS)
-
-clean:
-       rm -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
-               gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
-               sixdegrees.o splitkeys.o
-
-.depend: $(SRCS)
-       rm .depend
-       makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend
-
-include .depend
-
-.PHONY: all clean

diff --git a/Makefile.in b/Makefile.in
new file mode 100644 (file)
index 0000000..6cbcc49
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,70 @@
+#
+# Makefile for onak.
+#
+# $Id: Makefile,v 1.23 2004/05/31 22:04:50 noodles Exp $
+#
+
+CC = @CC@
+CFLAGS += @CFLAGS@ -Wall -pedantic -g
+# Uncomment to enable profiling.
+#LDFLAGS += -pg
+# Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.
+DBTYPE = db3
+# If using DBTYPE of "file" then comment the following line out.
+#LIBS = -L/usr/local/lib -lpq
+LIBS = -L/usr/local/lib -ldb3
+
+PROGS = add lookup gpgwww onak splitkeys
+CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \
+       keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
+       log.o photoid.o wordlist.o
+OBJS = merge.o stats.o sendsync.o cleankey.o $(CORE_OBJS)
+SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
+       keyindex.c stats.c lookup.c add.c keydb_$(DBTYPE).c ll.c hash.c \
+       gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \
+       wordlist.c cleankey.c
+
+all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
+
+splitkeys: splitkeys.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS)
+
+testparse: main.o $(OBJS)
+       $(CC) $(LDFLAGS) -o testparse main.o $(OBJS) $(LIBS)
+
+maxpath: maxpath.o $(OBJS)
+       $(CC) $(LDFLAGS) -o maxpath maxpath.o $(OBJS) $(LIBS)
+
+sixdegrees: sixdegrees.o $(OBJS)
+       $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)
+
+gpgwww: gpgwww.o $(OBJS)
+       $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
+
+lookup: lookup.o cleankey.o merge.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) \
+               $(LIBS)
+
+add: add.o cleankey.o merge.o sendsync.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) -o add add.o cleankey.o merge.o sendsync.o \
+               $(CORE_OBJS) $(LIBS)
+
+onak: onak.o merge.o cleankey.o $(CORE_OBJS)
+       $(CC) $(LDFLAGS) $(LDFLAGS) -o onak onak.o merge.o cleankey.o \
+               $(CORE_OBJS) $(LIBS)
+
+clean:
+       rm -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \
+               gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \
+               sixdegrees.o splitkeys.o
+
+distclean:
+       rm -f Makefile config.h .depend
+
+.depend: $(SRCS)
+       rm -f .depend
+       makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend
+
+include .depend
+
+.PHONY: all clean

diff --git a/config.h.in b/config.h.in
new file mode 100644 (file)
index 0000000..cae7912
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,18 @@
+/*
+ * config.h - Autoconf config header file.
+ *
+ * Jonathan McDowell <noodles@earth.li>
+ *
+ * Copyright 2004 Project Purple
+ *
+ * $Id: onak-conf.h,v 1.12 2003/10/15 21:15:21 noodles Exp $
+ */
+
+#ifndef __CONFIG_H_
+#define __CONFIG_H_
+
+/* Define to 1 if your processor stores words with the most significant byte
+ *    first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+#endif /* __CONFIG_H_ */

diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..f10db95
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,12 @@
+AC_PREREQ(2.50)
+
+AC_INIT
+AC_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+
+AC_C_BIGENDIAN
+
+AC_CONFIG_FILES(Makefile)
+
+AC_OUTPUT

diff --git a/md5.c b/md5.c
index 4930ae20eeebc8c93882a15b121fd494d88099eb..e18f224207f2e4de4d7a72b42982cdcb25c8880f 100644 (file)
--- a/md5.c
+++ b/md5.c
@@ -20,6 +20,8 @@
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdlib.h>

diff --git a/sha1.c b/sha1.c
index 87cfb50b90f762cb44c3d4d559c77c12cc84284d..604cd6164ee53184f49dad399955929c2ad51b4f 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -17,6 +17,8 @@
 
 #define SHA1HANDSOFF
 
+#include "config.h"
+
 #include <string.h>
 
 #include "sha1.h"