diff -up --recursive --new-file ntp-4.2.0.macro/configure.in ntp-4.2.0/configure.in --- ntp-4.2.0.macro/configure.in 2003-10-15 08:52:44.000000000 +0000 +++ ntp-4.2.0/configure.in 2004-01-23 19:47:02.000000000 +0000 @@ -25,6 +25,8 @@ AC_PROG_CC AC_PROG_CC_STDC AC_PROG_CPP +AM_CONDITIONAL(CROSS_COMPILING, [test "$cross_compiling" = yes]) + case "$host" in *-*-amigaos) CFLAGS="$CFLAGS -Dfork=vfork -DSYS_AMIGA" diff -up --recursive --new-file ntp-4.2.0.macro/ntpdc/Makefile.am ntp-4.2.0/ntpdc/Makefile.am --- ntp-4.2.0.macro/ntpdc/Makefile.am 2003-10-15 09:32:34.000000000 +0000 +++ ntp-4.2.0/ntpdc/Makefile.am 2004-01-23 20:03:51.000000000 +0000 @@ -1,9 +1,6 @@ #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies AUTOMAKE_OPTIONS = ../util/ansi2knr bin_PROGRAMS= ntpdc -EXTRA_PROGRAMS= ntpdc-layout -EXTRA_DATA= check-layout -BUILT_SOURCES= maybe-layout INCLUDES= -I$(top_srcdir)/include # LDADD might need RESLIB and ADJLIB ntpdc_LDADD= version.o ../libntp/libntp.a @READLINE_LIBS@ @@ -17,6 +14,11 @@ ETAGS_ARGS= Makefile.am ntpdc_SOURCES = ntpdc.c ntpdc_ops.c +if !CROSS_COMPILING +EXTRA_PROGRAMS= ntpdc-layout +EXTRA_DATA= check-layout +BUILT_SOURCES= maybe-layout + maybe-layout: @case "${PATH_PERL}" in \ /*) ${MAKE} check-layout ;; \ @@ -29,6 +31,7 @@ layout.here: ntpdc-layout check-layout: ntpdc-layout layout.std layout.here cmp $(srcdir)/layout.std layout.here && echo stamp > $@ +endif $(PROGRAMS): $(LDADD)