forked from osmocom/wireshark
Robert Schwebel:
Fix for http://bugs.wireshark.org/bugzilla/attachment.cgi?id=419&action=view cross compilation fails With the following change: Use only AC_CANONICAL_TARGET From the autoconf manual: The user is encouraged to use either `AC_CANONICAL_BUILD', or `AC_CANONICAL_HOST', or `AC_CANONICAL_TARGET', depending on the needs. Using `AC_CANONICAL_TARGET' is enough to run the two other macros. svn path=/trunk/; revision=19753
This commit is contained in:
parent
0c689e7297
commit
63f00dfdc7
|
@ -416,7 +416,7 @@ ps.c: print.ps rdps
|
|||
./rdps $(srcdir)/print.ps ps.c
|
||||
|
||||
rdps: rdps.c
|
||||
$(CC) $(CFLAGS) -o rdps $(srcdir)/rdps.c
|
||||
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o rdps $(srcdir)/rdps.c
|
||||
|
||||
randpkt_additional_libs = wiretap/libwiretap.la
|
||||
|
||||
|
|
14
configure.in
14
configure.in
|
@ -5,7 +5,13 @@ AC_INIT(cfile.h)
|
|||
AC_PREREQ(2.52)
|
||||
|
||||
dnl Check for CPU / vendor / OS
|
||||
AC_CANONICAL_HOST
|
||||
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
|
||||
dnl `AC_CANONICAL_HOST', or `AC_CANONICAL_TARGET', depending on the
|
||||
dnl needs. Using `AC_CANONICAL_TARGET' is enough to run the two other
|
||||
dnl macros.
|
||||
|
||||
dnl AC_CANONICAL_HOST
|
||||
dnl AC_CANONICAL_BUILD
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
AM_INIT_AUTOMAKE(wireshark, 0.99.4)
|
||||
|
@ -58,6 +64,12 @@ AC_SUBST(PYTHON)
|
|||
AC_SUBST(XSLTPROC)
|
||||
AC_SUBST(XMLLINT)
|
||||
|
||||
if test "x$CC_FOR_BUILD" = x
|
||||
then
|
||||
CC_FOR_BUILD=$(CC)
|
||||
fi
|
||||
AC_SUBST(CC_FOR_BUILD)
|
||||
|
||||
# Check for doxygen
|
||||
AC_PATH_PROG(DOXYGEN, doxygen)
|
||||
AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no")
|
||||
|
|
|
@ -34,8 +34,8 @@ CLEANFILES = \
|
|||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in
|
||||
|
||||
lemon_SOURCES = \
|
||||
lemon.c
|
||||
lemon: lemon.c
|
||||
$(CC_FOR_BUILD) -D_U_="" $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $<
|
||||
|
||||
EXTRA_DIST = \
|
||||
cppmagic.h \
|
||||
|
|
Loading…
Reference in New Issue