diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-08-30 17:05:46 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-08-30 17:05:46 +0400 |
| commit | 7e5d0e9f9542fc4014517e309ec3cc65866ea091 (patch) | |
| tree | 7fb2ee84ea69d58a2707582a71e0a9d276bd88a1 /winsup/configure.in | |
| parent | 3cdac9e9d411daa1d42f5c79b340238a2c7a1881 (diff) | |
* Makefile.in: Make installation of CYGWIN_LICENSE configurable.
* aclocal.m4: Regenerate.
* configure.in: Add GCC_NO_EXECUTABLES call. Add configuration for
INSTALL_LICENSE. Make cygwin subdirectory optional. Add sanity
check for cygwin resp. mingw subdirectories dependent of the target.
* configure: Regenerate.
Diffstat (limited to 'winsup/configure.in')
| -rwxr-xr-x | winsup/configure.in | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/winsup/configure.in b/winsup/configure.in index 2eb69fe1f..a6e10e0da 100755 --- a/winsup/configure.in +++ b/winsup/configure.in @@ -17,6 +17,8 @@ INSTALL=`cd $srcdir/..; echo $(pwd)/install-sh -c` AC_PROG_INSTALL AC_CANONICAL_SYSTEM +GCC_NO_EXECUTABLES + LIB_AC_PROG_CC LIB_AC_PROG_CXX @@ -31,10 +33,27 @@ no) use_cygserver=;; esac ]) -AC_CONFIG_SUBDIRS(cygwin w32api) +INSTALL_LICENSE= + +case "$target" in + *cygwin*) + if ! test -d $srcdir/cygwin; then + AC_MSG_ERROR("No cygwin dir. Can't build Cygwin. Exiting...") + fi + AC_CONFIG_SUBDIRS(cygwin) + INSTALL_LICENSE="install-license" + ;; + *mingw*) + if ! test -d $srcdir/mingw; then + AC_MSG_ERROR("No mingw dir. Can't build Mingw. Exiting...") + fi + ;; +esac + if test -d $srcdir/mingw; then AC_CONFIG_SUBDIRS(mingw) fi +AC_CONFIG_SUBDIRS(w32api) case "$with_cross_host" in ""|*cygwin*) @@ -54,6 +73,8 @@ case "$with_cross_host" in ;; esac +AC_SUBST(INSTALL_LICENSE) + AC_PROG_MAKE_SET AC_OUTPUT(Makefile) |