Fixes for Cygwin.

diff --git a/Makefile.m4 b/Makefile.m4
index b8d9316..fb2591d 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -91,30 +91,30 @@ _(gfshare) _(gfx-sqr)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
-_item`'-tab.h: _item`'-mktab
+_item`'-tab.h: _item`'-mktab$(EXEEXT)
        ./_item`'-mktab >_item`'-tab.h.new
        mv _item`'-tab.h.new _item`'-tab.h')dnl
 gen_tables
 
 primetab.h: primetab.c
-primetab.c: genprimes
+primetab.c: genprimes$(EXEEXT)
        ./genprimes -h primetab.h -c primetab.c \
                -s CATACOMB_PRIMETAB_H -n 256 \
                -t "unsigned short" -i primetab
 archinclude_HEADERS = mptypes.h
-mptypes.h: mptypes
+mptypes.h: mptypes$(EXEEXT)
        ./mptypes >mptypes.h.new
        mv mptypes.h.new mptypes.h
 
-ectab.c: ectab.in ec-gentab.awk mpdump
+ectab.c: ectab.in ec-gentab.awk mpdump$(EXEEXT)
        $(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
        mv ectab.c.new ectab.c
 
-ptab.c: ptab.in p-gentab.awk mpdump
+ptab.c: ptab.in p-gentab.awk mpdump$(EXEEXT)
        $(srcdir)/p-gentab.awk <$(srcdir)/ptab.in >ptab.c.new
        mv ptab.c.new ptab.c
 
-bintab.c: bintab.in bin-gentab.awk mpdump
+bintab.c: bintab.in bin-gentab.awk mpdump$(EXEEXT)
        $(srcdir)/bin-gentab.awk <$(srcdir)/bintab.in >bintab.c.new
        mv bintab.c.new bintab.c
 
@@ -261,7 +261,7 @@ noinst_PROGRAMS = \
        genprimes mptypes serpent-check bittest mpdump \
        perftest \
        addsuffix(`gen_tables', `-mktab')
-LDADD = libcatacomb.la libcatcrypt.a
+LDADD = libcatcrypt.a libcatacomb.la
 
 define(`LIBCAT_SRC', `cc.h getdate.h dnl
        cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
@@ -282,6 +282,7 @@ factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
 pixie_LDADD =
+pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c
 bittest_LDADD = 
@@ -306,6 +307,7 @@ mpdump_SOURCES = \
        mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \
        mptext.c mptext-string.c
 mpdump_LDADD =
+mpdump_CFLAGS = $(AM_CFLAGS)
 
 ## --- Install the pixie setuid-root if we can ---
 ##
@@ -337,7 +339,9 @@ man_MANS = \
 EXTRA_DIST = \
        Makefile.m4 genmodes gengctab $(man_MANS) xpixie \
        group-test.c rsa-test.c \
-       ectab.in ec-gentab.awk ptab.in p-gentab.awk bintab.in bin-gentab.awk \
+       ectab.in ec-gentab.awk \
+       ptab.in p-gentab.awk \
+       bintab.in bin-gentab.awk \
        README.cipher README.hash README.random README.mp \
        debian/rules debian/copyright debian/control debian/changelog \
        debian/catacomb-bin.postinst debian/catacomb-bin.config \
@@ -365,11 +369,11 @@ define(`testprogs', `')
 
 define(`CTESTRIG',
 `define(`testprogs', testprogs \
-       $1.t)dnl
+       $1.t$(EXEEXT))dnl
 $1.to: $1.c
        $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
-$1.t: $1.to libcatacomb.la
-       $(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
+$1.t$(EXEEXT): $1.to libcatacomb.la
+       $(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t$(EXEEXT)')
 
 CTESTRIG(rc4)
 CTESTRIG(seal)
@@ -428,7 +432,7 @@ CTESTRIG(rho)
 TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
-       *.t *.to \
+       *.t$(EXEEXT) *.to \
        mptypes.h primetab.c primetab.h ectab.c \
        addsuffix(`gen_tables', `-tab.h')
 

diff --git a/mptypes.c b/mptypes.c
index 9796d5c..922eae4 100644 (file)
--- a/mptypes.c
+++ b/mptypes.c
@@ -56,7 +56,7 @@
 
 /* --- Choose the largest integer type --- */
 
-#if defined(UINTMAX_MAX)
+#if defined(UINTMAX_MAX) && defined(PRIuMAX)
   typedef uintmax_t umax;
 # define P_UMAX PRIuMAX
 #elif defined(ULLONG_MAX)

diff --git a/setup b/setup
index ff17e27..571b48d 100755 (executable)
--- a/setup
+++ b/setup
@@ -7,5 +7,6 @@ mkaclocal
 m4 Makefile.m4 >Makefile.am
 (cd tests && m4 Makefile.m4 >Makefile.am)
 autoconf
+autoheader
 automake -a
 mkdir -p build