diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index efe0d2612..1d87d2fce 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,12 @@ +2006-08-30 Corinna Vinschen + + * configure.in: Substitute with_cross_host in depending files. + * configure: Regenerate. + * lib/Makefile.in: Add with_cross_host to allow more granular checks. + Set installation directories accordingly. + * lib/ddk/Makefile.in: Ditto. + * lib/directx/Makefile.in: Ditto. + 2006-08-10 Danny Smith * lib/wtsapi32.def (WTSGetActiveConsoleSessionId). Move from here... diff --git a/winsup/w32api/configure b/winsup/w32api/configure index 33c9ad8c7..cffbf1a90 100755 --- a/winsup/w32api/configure +++ b/winsup/w32api/configure @@ -272,7 +272,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="lib/scrnsave.c" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC ac_ct_CC CFLAGS AR ac_ct_AR AS ac_ct_AS RANLIB ac_ct_RANLIB LD ac_ct_LD DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES BUILDENV LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC ac_ct_CC CFLAGS with_cross_host AR ac_ct_AR AS ac_ct_AS RANLIB ac_ct_RANLIB LD ac_ct_LD DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES BUILDENV LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -873,7 +873,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -1493,6 +1493,7 @@ fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -2652,6 +2653,7 @@ s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@CC@,$CC,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@CFLAGS@,$CFLAGS,;t t +s,@with_cross_host@,$with_cross_host,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@AS@,$AS,;t t @@ -2833,6 +2835,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -2871,12 +2878,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff --git a/winsup/w32api/configure.in b/winsup/w32api/configure.in index e30c4b509..d8b8c951e 100644 --- a/winsup/w32api/configure.in +++ b/winsup/w32api/configure.in @@ -20,6 +20,7 @@ CFLAGS=${CFLAGS-"-O2 -g"} AC_CHECK_TOOL(CC, gcc, gcc) AC_SUBST(CC) AC_SUBST(CFLAGS) +AC_SUBST(with_cross_host) dnl check for various tools AC_CHECK_TOOL(AR, ar, ar) diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index b678d2b1f..1127fb227 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -21,6 +21,7 @@ subdirs := ddk directx host_alias = @host@ build_alias = @build@ target_alias = @target@ +with_cross_host = @with_cross_host@ prefix = @prefix@ includedir:=@includedir@ @@ -43,9 +44,14 @@ ifneq (,$(findstring cygwin,$(target_alias))) inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else +ifneq (,$with_cross_host) +inst_includedir:=$(tooldir)/include/w32api +inst_libdir:=$(tooldir)/lib +else inst_includedir:=$(includedir) inst_libdir:=$(libdir) endif +endif INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in index fa2ebcff4..c7c5cdde7 100644 --- a/winsup/w32api/lib/ddk/Makefile.in +++ b/winsup/w32api/lib/ddk/Makefile.in @@ -17,6 +17,7 @@ VPATH = @srcdir@ host_alias = @host@ build_alias = @build@ target_alias = @target@ +with_cross_host = @with_cross_host@ prefix = @prefix@ includedir:=@includedir@ @@ -39,9 +40,14 @@ ifneq (,$(findstring cygwin,$(target_alias))) inst_includedir:=$(tooldir)/include/w32api/ddk inst_libdir:=$(tooldir)/lib/w32api else +ifneq (,$with_cross_host) +inst_includedir:=$(tooldir)/include/w32api/ddk +inst_libdir:=$(tooldir)/lib +else inst_includedir:=$(includedir)/ddk inst_libdir:=$(libdir) endif +endif INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in index 042cae0ed..1d1074285 100644 --- a/winsup/w32api/lib/directx/Makefile.in +++ b/winsup/w32api/lib/directx/Makefile.in @@ -17,6 +17,7 @@ VPATH = @srcdir@ host_alias = @host@ build_alias = @build@ target_alias = @target@ +with_cross_host = @with_cross_host@ prefix = @prefix@ includedir:=@includedir@ @@ -39,9 +40,14 @@ ifneq (,$(findstring cygwin,$(target_alias))) inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else +ifneq (,$with_cross_host) +inst_includedir:=$(tooldir)/include/w32api +inst_libdir:=$(tooldir)/lib +else inst_includedir:=$(includedir) inst_libdir:=$(libdir) endif +endif INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@