wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 485409 - Handle a Windows-style path as $srcdir in configure, by modifying the default autoconf M4 macros so that they recognize Z:/ as an absolute path. r=ted

Browse Source
This commit is contained in:
Benjamin Smedberg 2009-09-22 09:05:48 -04:00
parent 50bf449113
commit 56a8d84c46
10 changed files with 168 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aclocal.m4 vendored
View File

@ -12,6 +12,7 @@ builtin(include, build/autoconf/freetype2.m4)dnl
builtin(include, build/autoconf/codeset.m4)dnl
builtin(include, build/autoconf/altoptions.m4)dnl
builtin(include, build/autoconf/mozprog.m4)dnl
builtin(include, build/autoconf/acwinpaths.m4)dnl
MOZ_PROG_CHECKMSYS()

2
browser/installer/Makefile.in
View File

@ -98,7 +98,7 @@ ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
GARBAGE += $(MOZ_PKG_MANIFEST)
endif

65
build/autoconf/acwinpaths.m4 Normal file
View File

@ -0,0 +1,65 @@
dnl ***** BEGIN LICENSE BLOCK *****
dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
dnl
dnl The contents of this file are subject to the Mozilla Public License Version
dnl 1.1 (the "License"); you may not use this file except in compliance with
dnl the License. You may obtain a copy of the License at
dnl http://www.mozilla.org/MPL/
dnl
dnl Software distributed under the License is distributed on an "AS IS" basis,
dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
dnl for the specific language governing rights and limitations under the
dnl License.
dnl
dnl The Original Code is mozilla.org code.
dnl
dnl The Initial Developer of the Original Code is the
dnl Mozilla Foundation <http://www.mozilla.org>
dnl
dnl Portions created by the Initial Developer are Copyright (C) 2009
dnl the Initial Developer. All Rights Reserved.
dnl
dnl Contributor(s):
dnl Benjamin Smedberg
dnl
dnl Alternatively, the contents of this file may be used under the terms of
dnl either of the GNU General Public License Version 2 or later (the "GPL"),
dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
dnl in which case the provisions of the GPL or the LGPL are applicable instead
dnl of those above. If you wish to allow use of your version of this file only
dnl under the terms of either the GPL or the LGPL, and not to allow others to
dnl use your version of this file under the terms of the MPL, indicate your
dnl decision by deleting the provisions above and replace them with the notice
dnl and other provisions required by the GPL or the LGPL. If you do not delete
dnl the provisions above, a recipient may use your version of this file under
dnl the terms of any one of the MPL, the GPL or the LGPL.
dnl
dnl ***** END LICENSE BLOCK *****
define(GENERATE_SUB_ABS, [
define([AC_OUTPUT_FILES_SUB1], [
patsubst($@, [/\*)], [/* | ?:/*)])
])
])
GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
define(GENERATE_SUB_NOSPLIT, [
define([AC_OUTPUT_FILES], [
patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
])
])
GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
define(GENERATE_HEADER_NOSPLIT, [
define([AC_OUTPUT_HEADER], [
patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
])
])
GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
define(GENERATE_SUBDIRS_ABS, [
define([AC_OUTPUT_SUBDIRS], [
patsubst($@, [/\*)], [/* | ?:/*)])
])
])
GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))

16
build/msys-perl-wrapper Normal file
View File

@ -0,0 +1,16 @@
#!/bin/sh
args=""
for i in "${@}"
do
case "$i" in
-I?:/*)
i="$(echo "${i}" | sed -e 's|^-I\(.\):/|-I/\1/|')"
;;
esac
args="${args} '${i}'"
done
eval "exec perl $args"

2
config/rules.mk
View File

@ -89,7 +89,7 @@ endif
endif
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
_VPATH_SRCS = $(if $(filter /%,$<),$<,$(CURDIR)/$<)
_VPATH_SRCS = $(abspath $<)
else
_VPATH_SRCS = $<
endif

1
configure.in
View File

@ -1623,6 +1623,7 @@ case "$host" in
case "$host" in
*mingw*)
dnl MinGW/MSYS does not need CYGWIN_WRAPPER
PERL="/bin/sh ${srcdir}/build/msys-perl-wrapper"
;;
*)
CYGWIN_WRAPPER="${srcdir}/build/cygwin-wrapper"

1
js/src/aclocal.m4 vendored
View File

@ -8,5 +8,6 @@ builtin(include, build/autoconf/nspr.m4)dnl
builtin(include, build/autoconf/altoptions.m4)dnl
builtin(include, build/autoconf/moznbytetype.m4)dnl
builtin(include, build/autoconf/mozprog.m4)dnl
builtin(include, build/autoconf/acwinpaths.m4)dnl
MOZ_PROG_CHECKMSYS()

65
js/src/build/autoconf/acwinpaths.m4 Normal file
View File

@ -0,0 +1,65 @@
dnl ***** BEGIN LICENSE BLOCK *****
dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
dnl
dnl The contents of this file are subject to the Mozilla Public License Version
dnl 1.1 (the "License"); you may not use this file except in compliance with
dnl the License. You may obtain a copy of the License at
dnl http://www.mozilla.org/MPL/
dnl
dnl Software distributed under the License is distributed on an "AS IS" basis,
dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
dnl for the specific language governing rights and limitations under the
dnl License.
dnl
dnl The Original Code is mozilla.org code.
dnl
dnl The Initial Developer of the Original Code is the
dnl Mozilla Foundation <http://www.mozilla.org>
dnl
dnl Portions created by the Initial Developer are Copyright (C) 2009
dnl the Initial Developer. All Rights Reserved.
dnl
dnl Contributor(s):
dnl Benjamin Smedberg
dnl
dnl Alternatively, the contents of this file may be used under the terms of
dnl either of the GNU General Public License Version 2 or later (the "GPL"),
dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
dnl in which case the provisions of the GPL or the LGPL are applicable instead
dnl of those above. If you wish to allow use of your version of this file only
dnl under the terms of either the GPL or the LGPL, and not to allow others to
dnl use your version of this file under the terms of the MPL, indicate your
dnl decision by deleting the provisions above and replace them with the notice
dnl and other provisions required by the GPL or the LGPL. If you do not delete
dnl the provisions above, a recipient may use your version of this file under
dnl the terms of any one of the MPL, the GPL or the LGPL.
dnl
dnl ***** END LICENSE BLOCK *****
define(GENERATE_SUB_ABS, [
define([AC_OUTPUT_FILES_SUB1], [
patsubst($@, [/\*)], [/* | ?:/*)])
])
])
GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
define(GENERATE_SUB_NOSPLIT, [
define([AC_OUTPUT_FILES], [
patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
])
])
GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
define(GENERATE_HEADER_NOSPLIT, [
define([AC_OUTPUT_HEADER], [
patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
])
])
GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
define(GENERATE_SUBDIRS_ABS, [
define([AC_OUTPUT_SUBDIRS], [
patsubst($@, [/\*)], [/* | ?:/*)])
])
])
GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))

16
js/src/build/msys-perl-wrapper Normal file
View File

@ -0,0 +1,16 @@
#!/bin/sh
args=""
for i in "${@}"
do
case "$i" in
-I?:/*)
i="$(echo "${i}" | sed -e 's|^-I\(.\):/|-I/\1/|')"
;;
esac
args="${args} '${i}'"
done
eval "exec perl $args"

2
js/src/config/rules.mk
View File

@ -89,7 +89,7 @@ endif
endif
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
_VPATH_SRCS = $(if $(filter /%,$<),$<,$(CURDIR)/$<)
_VPATH_SRCS = $(abspath $<)
else
_VPATH_SRCS = $<
endif