Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve cross-compilation support [once autoconf 2.70 is widespread] #1199

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,17 @@ This step is only needed if configure.ac has been changed, or if configure
does not exist (for example, when building from a git clone). The
configure script and config.h.in can be built by running:

...copy config.guess, config.sub, and install-sh from elsewhere
autoheader
autoconf

If you have a full GNU autotools install, you can alternatively run:

autoreconf
autoreconf -i

(With autoconf 2.70 or later, autoreconf -i/--install will create the
config.guess, etc files; with earlier versions you will need to copy them
from Gnulib, Autoconf, or elsewhere yourself.)

Basic Installation
==================
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ committed to this repository, so building the code from a Git repository
requires extra steps:

```sh
cp ..etc.. . # Copy config.guess, config.sub, and install-sh from elsewhere
autoheader # If using configure, generate the header template...
autoconf # ...and configure script (or use autoreconf to do both)
./configure # Optional but recommended, for choosing extra functionality
Expand Down
5 changes: 3 additions & 2 deletions config.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ libexecdir = @libexecdir@
datarootdir = @datarootdir@
mandir = @mandir@

CC = @CC@
RANLIB = @RANLIB@
CC = @CC@
INSTALL = @INSTALL@
RANLIB = @RANLIB@

CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
Expand Down
7 changes: 4 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ endif
EOF
AC_MSG_ERROR([$1], [$2])])

AC_CANONICAL_HOST
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_RANLIB

dnl Turn on compiler warnings, if possible
Expand Down Expand Up @@ -137,9 +139,8 @@ AC_ARG_ENABLE([s3],
[support Amazon AWS S3 URLs])],
[], [enable_s3=check])

basic_host=${host_alias:-unknown-`uname -s`}
AC_MSG_CHECKING([shared library type for $basic_host])
case $basic_host in
AC_MSG_CHECKING([shared library type${host_alias:+ for $host_alias}])
case $host in
*-cygwin* | *-CYGWIN*)
host_result="Cygwin DLL"
PLATFORM=CYGWIN
Expand Down