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

diff --git a/Makefile b/Makefile.in
similarity index 70%
rename from Makefile
rename to Makefile.in
index d626ffdb5547cccb8289e123951fce973b126556..6cbcc49e1bc6d9163ea18a983474b6752d541eba 100644 (file)
--- a/Makefile
+++ b/Makefile.in
@@ -4,9 +4,8 @@
 # $Id: Makefile,v 1.23 2004/05/31 22:04:50 noodles Exp $
 #
 
 # $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
+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.
 # Uncomment to enable profiling.
 #LDFLAGS += -pg
 # Can be "pg" for Postgresql, "file" for flat files or "db2" for pksd db2 style.


@@ -28,37 +27,42 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
 
 splitkeys: splitkeys.o $(CORE_OBJS)
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys
 
 splitkeys: splitkeys.o $(CORE_OBJS)

-       $(LINK) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS)

 
 testparse: main.o $(OBJS)
 
 testparse: main.o $(OBJS)

-       $(LINK) -o testparse main.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o testparse main.o $(OBJS) $(LIBS)

 
 maxpath: maxpath.o $(OBJS)
 
 maxpath: maxpath.o $(OBJS)

-       $(LINK) -o maxpath maxpath.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o maxpath maxpath.o $(OBJS) $(LIBS)

 
 sixdegrees: sixdegrees.o $(OBJS)
 
 sixdegrees: sixdegrees.o $(OBJS)

-       $(LINK) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o sixdegrees sixdegrees.o $(OBJS) $(LIBS)

 
 gpgwww: gpgwww.o $(OBJS)
 
 gpgwww: gpgwww.o $(OBJS)

-       $(LINK) -o gpgwww gpgwww.o $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o gpgwww gpgwww.o $(OBJS) $(LIBS)

 
 lookup: lookup.o cleankey.o merge.o $(CORE_OBJS)
 
 lookup: lookup.o cleankey.o merge.o $(CORE_OBJS)

-       $(LINK) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o merge.o $(CORE_OBJS) \
+               $(LIBS)

 
 add: add.o cleankey.o merge.o sendsync.o $(CORE_OBJS)
 
 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)
+       $(CC) $(LDFLAGS) -o add add.o cleankey.o merge.o sendsync.o \
+               $(CORE_OBJS) $(LIBS)

 
 onak: onak.o merge.o cleankey.o $(CORE_OBJS)
 
 onak: onak.o merge.o cleankey.o $(CORE_OBJS)

-       $(LINK) $(LDFLAGS) -o onak onak.o merge.o cleankey.o $(CORE_OBJS) \
-               $(LIBS)
+       $(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
 
 
 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)
 .depend: $(SRCS)

-       rm .depend
+       rm -f .depend

        makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend
 
 include .depend
        makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend
 
 include .depend

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.  */
 
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 

+#include "config.h"
+

 #include <sys/types.h>
 
 #include <stdlib.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
 
 
 #define SHA1HANDSOFF
 

+#include "config.h"
+

 #include <string.h>
 
 #include "sha1.h"
 #include <string.h>
 
 #include "sha1.h"