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 1251210 - In configure.py, take AUTOCONF from the environment, if set there. r=ted

Browse Source 
At the same time, remove the (useless and wrong) check for AUTOCONF in
old-configure.in (wrong because it very likely is picking autoconf > 2.5).
This commit is contained in:
Mike Hommey 2016-02-26 02:08:29 +09:00
parent 670be3a9fa
commit 66228d8227
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.py
View File

@ -24,7 +24,15 @@ if sys.platform == 'win32':
shell = shell + '.exe' shell = shell + '.exe'
def is_absolute_or_relative(path):
if os.altsep and os.altsep in path:
return True
return os.sep in path
def find_program(file): def find_program(file):
if is_absolute_or_relative(file):
return os.path.abspath(file) if os.path.isfile(file) else None
try: try:
return which(file) return which(file)
except WhichError: except WhichError:
@ -45,10 +53,12 @@ def autoconf_refresh(configure):
else: else:
return return
for ac in ('autoconf-2.13', 'autoconf2.13', 'autoconf213'): for ac in (os.environ.get('AUTOCONF'), 'autoconf-2.13', 'autoconf2.13',
autoconf = find_program(ac) 'autoconf213'):
if autoconf: if ac:
break autoconf = find_program(ac)
if autoconf:
break
else: else:
fink = find_program('fink') fink = find_program('fink')
if fink: if fink:
@ -58,6 +68,9 @@ def autoconf_refresh(configure):
if not autoconf: if not autoconf:
raise RuntimeError('Could not find autoconf 2.13') raise RuntimeError('Could not find autoconf 2.13')
# Add or adjust AUTOCONF for subprocesses, especially the js/src configure
os.environ['AUTOCONF'] = autoconf
print('Refreshing %s' % configure, file=sys.stderr) print('Refreshing %s' % configure, file=sys.stderr)
with open(configure, 'wb') as fh: with open(configure, 'wb') as fh:

1
js/src/old-configure.in
View File

@ -570,7 +570,6 @@ fi
AC_SUBST(NSINSTALL_BIN) AC_SUBST(NSINSTALL_BIN)
MOZ_PATH_PROG(DOXYGEN, doxygen, :) MOZ_PATH_PROG(DOXYGEN, doxygen, :)
MOZ_PATH_PROG(AUTOCONF, autoconf, :)
MOZ_PATH_PROG(XARGS, xargs) MOZ_PATH_PROG(XARGS, xargs)
if test -z "$XARGS" -o "$XARGS" = ":"; then if test -z "$XARGS" -o "$XARGS" = ":"; then
AC_MSG_ERROR([xargs not found in \$PATH .]) AC_MSG_ERROR([xargs not found in \$PATH .])

1
old-configure.in
View File

@ -782,7 +782,6 @@ fi
AC_SUBST(NSINSTALL_BIN) AC_SUBST(NSINSTALL_BIN)
MOZ_PATH_PROG(DOXYGEN, doxygen, :) MOZ_PATH_PROG(DOXYGEN, doxygen, :)
MOZ_PATH_PROG(AUTOCONF, autoconf, :)
MOZ_PATH_PROGS(UNZIP, unzip) MOZ_PATH_PROGS(UNZIP, unzip)
if test -z "$UNZIP" -o "$UNZIP" = ":"; then if test -z "$UNZIP" -o "$UNZIP" = ":"; then
AC_MSG_ERROR([unzip not found in \$PATH]) AC_MSG_ERROR([unzip not found in \$PATH])