Download Reference Manual
The Developer's Library for D
About Wiki Forums Source Search Contact

Changeset 3153

Show
Ignore:
Timestamp:
02/06/08 17:25:37 (10 months ago)
Author:
Gregor
Message:

lib/compiler/gdc/*, lib/install-gdc.sh: Made some changes to allow installing when Phobos isn't already installed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/compiler/gdc/Makefile.in

    r2502 r3153  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am. 
     1# Makefile.in generated by automake 1.10 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005  Free Software Foundation, Inc. 
     5# 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
     
    3434# AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies 
    3535 
    36 top_srcdir = @top_srcdir@ 
    3736VPATH = @srcdir@ 
    3837pkgdatadir = $(datadir)/@PACKAGE@ 
    3938pkglibdir = $(libdir)/@PACKAGE@ 
    4039pkgincludedir = $(includedir)/@PACKAGE@ 
    41 top_builddir = . 
    4240am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
    43 INSTALL = @INSTALL@ 
    4441install_sh_DATA = $(install_sh) -c -m 644 
    4542install_sh_PROGRAM = $(install_sh) -c 
     
    5754target_triplet = @target@ 
    5855noinst_PROGRAMS = minimal$(EXEEXT) 
     56subdir = . 
    5957DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 
    6058    $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 
     
    6260    $(top_srcdir)/configure config.guess config.sub install-sh \ 
    6361    missing 
    64 subdir = . 
    6562ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    6663am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ 
     
    6966    $(ACLOCAL_M4) 
    7067am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 
    71  configure.lineno configure.status.lineno 
     68 configure.lineno config.status.lineno 
    7269mkinstalldirs = $(install_sh) -d 
    7370CONFIG_HEADER = config.h 
     
    7774minimal_OBJECTS = $(am_minimal_OBJECTS) 
    7875minimal_LDADD = $(LDADD) 
    79 DEFAULT_INCLUDES = -I. -I$(srcdir) -I. 
     76DEFAULT_INCLUDES = -I.@am__isrc@ 
    8077depcomp = 
    8178am__depfiles_maybe = 
     
    9996distuninstallcheck_listfiles = find . -type f -print 
    10097distcleancheck_listfiles = find . -type f -print 
    101 srcdir = @srcdir@ 
    10298ACLOCAL = @ACLOCAL@ 
    10399AMTAR = @AMTAR@ 
     
    143139D_EXTRA_OBJS = @D_EXTRA_OBJS@ gcc/support.o 
    144140D_FRAGMENT_SRCDIR = @D_FRAGMENT_SRCDIR@ 
    145 D_GENERATE_FRAGMENTS_FALSE = @D_GENERATE_FRAGMENTS_FALSE@ 
    146 D_GENERATE_FRAGMENTS_TRUE = @D_GENERATE_FRAGMENTS_TRUE@ 
    147141D_MEM_FLAGS = @D_MEM_FLAGS@ 
    148142D_MEM_MODULES = @D_MEM_MODULES@ 
     
    155149GDC = @GDC@ 
    156150GREP = @GREP@ 
     151INSTALL = @INSTALL@ 
    157152INSTALL_DATA = @INSTALL_DATA@ 
    158153INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
     
    164159LTLIBOBJS = @LTLIBOBJS@ 
    165160MAKEINFO = @MAKEINFO@ 
     161MKDIR_P = @MKDIR_P@ 
    166162OBJEXT = @OBJEXT@ 
    167163PACKAGE = @PACKAGE@ 
     
    177173STRIP = @STRIP@ 
    178174VERSION = @VERSION@ 
     175abs_builddir = @abs_builddir@ 
     176abs_srcdir = @abs_srcdir@ 
     177abs_top_builddir = @abs_top_builddir@ 
     178abs_top_srcdir = @abs_top_srcdir@ 
    179179ac_ct_CC = @ac_ct_CC@ 
    180180ac_ct_CXX = @ac_ct_CXX@ 
     
    188188build_os = @build_os@ 
    189189build_vendor = @build_vendor@ 
     190builddir = @builddir@ 
    190191datadir = @datadir@ 
    191192datarootdir = @datarootdir@ 
     
    218219sbindir = @sbindir@ 
    219220sharedstatedir = @sharedstatedir@ 
     221srcdir = @srcdir@ 
    220222sysconfdir = @sysconfdir@ 
    221223target = @target@ 
     
    224226target_os = @target_os@ 
    225227target_vendor = @target_vendor@ 
     228top_builddir = @top_builddir@ 
     229top_srcdir = @top_srcdir@ 
    226230OUR_CFLAGS = @DEFS@ -I. 
    227231D_EXTRA_DFLAGS = -nostdinc -pipe -I../../.. -fversion=Posix 
     
    384388    @if test ! -f $@; then \ 
    385389      rm -f stamp-h1; \ 
    386       $(MAKE) stamp-h1; \ 
     390      $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ 
    387391    else :; fi 
    388392 
     
    406410minimal$(EXEEXT): $(minimal_OBJECTS) $(minimal_DEPENDENCIES)  
    407411    @rm -f minimal$(EXEEXT) 
    408     $(LINK) $(minimal_LDFLAGS) $(minimal_OBJECTS) $(minimal_LDADD) $(LIBS) 
     412    $(LINK) $(minimal_OBJECTS) $(minimal_LDADD) $(LIBS) 
    409413 
    410414mostlyclean-compile: 
     
    416420.c.obj: 
    417421    $(COMPILE) -c `$(CYGPATH_W) '$<'` 
    418 uninstall-info-am: 
    419422 
    420423ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 
     
    468471distdir: $(DISTFILES) 
    469472    $(am__remove_distdir) 
    470     mkdir $(distdir) 
    471     $(mkdir_p) $(distdir)/. 
    472     @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
    473     topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
    474     list='$(DISTFILES)'; for file in $$list; do \ 
    475       case $$file in \ 
    476         $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
    477         $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
    478       esac; \ 
     473    test -d $(distdir) || mkdir $(distdir) 
     474    @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
     475    topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
     476    list='$(DISTFILES)'; \ 
     477      dist_files=`for file in $$list; do echo $$file; done | \ 
     478      sed -e "s|^$$srcdirstrip/||;t" \ 
     479          -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
     480    case $$dist_files in \ 
     481      */*) $(MKDIR_P) `echo "$$dist_files" | \ 
     482               sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
     483               sort -u` ;; \ 
     484    esac; \ 
     485    for file in $$dist_files; do \ 
    479486      if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
    480       dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    481       if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
    482         dir="/$$dir"; \ 
    483         $(mkdir_p) "$(distdir)$$dir"; \ 
    484       else \ 
    485         dir=''; \ 
    486       fi; \ 
    487487      if test -d $$d/$$file; then \ 
     488        dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    488489        if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    489490          cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
     
    499500      ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ 
    500501      ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ 
    501       ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ 
     502      ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ 
    502503    || chmod -R a+r $(distdir) 
    503504dist-gzip: distdir 
     
    574575    @(echo "$(distdir) archives ready for distribution: "; \ 
    575576      list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ 
    576       sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}
     577      sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x
    577578distuninstallcheck: 
    578579    @cd $(distuninstallcheck_dir) \ 
     
    648649install-data-am: install-data-local 
    649650 
     651install-dvi: install-dvi-am 
     652 
    650653install-exec-am: install-exec-local 
    651654 
     655install-html: install-html-am 
     656 
    652657install-info: install-info-am 
    653658 
    654659install-man: 
     660 
     661install-pdf: install-pdf-am 
     662 
     663install-ps: install-ps-am 
    655664 
    656665installcheck-am: 
     
    674683ps-am: 
    675684 
    676 uninstall-am: uninstall-info-am 
     685uninstall-am: 
     686 
     687.MAKE: install-am install-strip 
    677688 
    678689.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ 
     
    683694    distclean-tags distcleancheck distdir distuninstallcheck dvi \ 
    684695    dvi-am html html-am info info-am install install-am \ 
    685     install-data install-data-am install-data-local install-exec \ 
    686     install-exec-am install-exec-local install-info \ 
    687     install-info-am install-man install-strip installcheck \ 
    688     installcheck-am installdirs maintainer-clean \ 
    689     maintainer-clean-generic mostlyclean mostlyclean-compile \ 
    690     mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ 
    691     uninstall-am uninstall-info-am 
     696    install-data install-data-am install-data-local install-dvi \ 
     697    install-dvi-am install-exec install-exec-am install-exec-local \ 
     698    install-html install-html-am install-info install-info-am \ 
     699    install-man install-pdf install-pdf-am install-ps \ 
     700    install-ps-am install-strip installcheck installcheck-am \ 
     701    installdirs maintainer-clean maintainer-clean-generic \ 
     702    mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ 
     703    ps ps-am tags uninstall uninstall-am 
    692704 
    693705minimal.c: 
     
    800812    rm -f gen_config1$(EXEEXT) gen_unix$(EXEEXT) gen_math$(EXEEXT) 
    801813    rm -f frag-gen frag-math frag-unix 
    802     rm -f $(config_d_src) $(configunix_d_src) 
     814    rm -f $(config_d_src) 
    803815    rm -f libgphobos.a 
    804816    rm -f libgphobos_t.a 
  • trunk/lib/compiler/gdc/aclocal.m4

    r2465 r3153  
    1 # generated automatically by aclocal 1.9.6 -*- Autoconf -*- 
     1# generated automatically by aclocal 1.10 -*- Autoconf -*- 
    22 
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
    4 # 2005  Free Software Foundation, Inc. 
     4# 2005, 2006  Free Software Foundation, Inc. 
    55# This file is free software; the Free Software Foundation 
    66# gives unlimited permission to copy and/or distribute it, 
     
    1212# PARTICULAR PURPOSE. 
    1313 
    14 # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc. 
     14m4_if(m4_PACKAGE_VERSION, [2.61],, 
     15[m4_fatal([this file was generated for autoconf 2.61. 
     16You have another version of autoconf.  If you want to use that, 
     17you should regenerate the build system entirely.], [63])]) 
     18 
     19# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc. 
    1520# 
    1621# This file is free software; the Free Software Foundation 
     
    2227# Automake X.Y traces this macro to ensure aclocal.m4 has been 
    2328# generated from the m4 files accompanying Automake X.Y. 
    24 AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) 
     29# (This private macro should not be called outside this file.) 
     30AC_DEFUN([AM_AUTOMAKE_VERSION], 
     31[am__api_version='1.10' 
     32dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 
     33dnl require some minimum version.  Point them to the right macro. 
     34m4_if([$1], [1.10], [], 
     35      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 
     36]) 
     37 
     38# _AM_AUTOCONF_VERSION(VERSION) 
     39# ----------------------------- 
     40# aclocal traces this macro to find the Autoconf version. 
     41# This is a private macro too.  Using m4_define simplifies 
     42# the logic in aclocal, which can simply ignore this definition. 
     43m4_define([_AM_AUTOCONF_VERSION], []) 
    2544 
    2645# AM_SET_CURRENT_AUTOMAKE_VERSION 
    2746# ------------------------------- 
    28 # Call AM_AUTOMAKE_VERSION so it can be traced. 
     47# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. 
    2948# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. 
    3049AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 
    31      [AM_AUTOMAKE_VERSION([1.9.6])]) 
     50[AM_AUTOMAKE_VERSION([1.10])dnl 
     51_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) 
    3252 
    3353# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*- 
     
    86106# AM_CONDITIONAL                                            -*- Autoconf -*- 
    87107 
    88 # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 
     108# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 
    89109# Free Software Foundation, Inc. 
    90110# 
     
    93113# with or without modifications, as long as this notice is preserved. 
    94114 
    95 # serial 7 
     115# serial 8 
    96116 
    97117# AM_CONDITIONAL(NAME, SHELL-CONDITION) 
     
    102122 ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])], 
    103123    [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl 
    104 AC_SUBST([$1_TRUE]) 
    105 AC_SUBST([$1_FALSE]) 
     124AC_SUBST([$1_TRUE])dnl 
     125AC_SUBST([$1_FALSE])dnl 
     126_AM_SUBST_NOTMAKE([$1_TRUE])dnl 
     127_AM_SUBST_NOTMAKE([$1_FALSE])dnl 
    106128if $2; then 
    107129  $1_TRUE= 
     
    119141# Do all the work for Automake.                             -*- Autoconf -*- 
    120142 
    121 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 
    122 # Free Software Foundation, Inc. 
     143# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
     144# 2005, 2006 Free Software Foundation, Inc. 
    123145# 
    124146# This file is free software; the Free Software Foundation 
     
    143165# release and drop the old call support. 
    144166AC_DEFUN([AM_INIT_AUTOMAKE], 
    145 [AC_PREREQ([2.58])dnl 
     167[AC_PREREQ([2.60])dnl 
    146168dnl Autoconf wants to disallow AM_ names.  We explicitly allow 
    147169dnl the ones we care about. 
     
    149171AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl 
    150172AC_REQUIRE([AC_PROG_INSTALL])dnl 
    151 # test to see if srcdir already configured 
    152 if test "`cd $srcdir && pwd`" != "`pwd`" && 
    153    test -f $srcdir/config.status; then 
    154   AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) 
     173if test "`cd $srcdir && pwd`" != "`pwd`"; then 
     174  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output 
     175  # is not polluted with repeated "-I." 
     176  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl 
     177  # test to see if srcdir already configured 
     178  if test -f $srcdir/config.status; then 
     179    AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) 
     180  fi 
    155181fi 
    156182 
     
    172198 AC_SUBST([VERSION], [$2])], 
    173199[_AM_SET_OPTIONS([$1])dnl 
     200dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. 
     201m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, 
     202  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl 
    174203 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl 
    175204 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl 
     
    207236                  [define([AC_PROG_CXX], 
    208237                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl 
     238AC_PROVIDE_IFELSE([AC_PROG_OBJC], 
     239                  [_AM_DEPENDENCIES(OBJC)], 
     240                  [define([AC_PROG_OBJC], 
     241                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl 
    209242]) 
    210243]) 
     
    242275AC_DEFUN([AM_PROG_INSTALL_SH], 
    243276[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 
    244 install_sh=${install_sh-"$am_aux_dir/install-sh"} 
     277install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} 
    245278AC_SUBST(install_sh)]) 
    246279 
     
    268301# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*- 
    269302 
    270 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 200
     303# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 200
    271304# Free Software Foundation, Inc. 
    272305# 
     
    275308# with or without modifications, as long as this notice is preserved. 
    276309 
    277 # serial 4 
     310# serial 5 
    278311 
    279312# AM_MISSING_PROG(NAME, PROGRAM) 
     
    291324AC_DEFUN([AM_MISSING_HAS_RUN], 
    292325[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 
     326AC_REQUIRE_AUX_FILE([missing])dnl 
    293327test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" 
    294328# Use eval to expand $SHELL 
     
    301335]) 
    302336 
    303 # Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc. 
     337# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
    304338# 
    305339# This file is free software; the Free Software Foundation 
     
    309343# AM_PROG_MKDIR_P 
    310344# --------------- 
    311 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. 
    312 
    313 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories 
    314 # created by `make install' are always world readable, even if the 
    315 # installer happens to have an overly restrictive umask (e.g. 077). 
    316 # This was a mistake.  There are at least two reasons why we must not 
    317 # use `-m 0755': 
    318 #   - it causes special bits like SGID to be ignored, 
    319 #   - it may be too restrictive (some setups expect 775 directories). 
    320 
    321 # Do not use -m 0755 and let people choose whatever they expect by 
    322 # setting umask. 
    323 
    324 # We cannot accept any implementation of `mkdir' that recognizes `-p'. 
    325 # Some implementations (such as Solaris 8's) are not thread-safe: if a 
    326 # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' 
    327 # concurrently, both version can detect that a/ is missing, but only 
    328 # one can create it and the other will error out.  Consequently we 
    329 # restrict ourselves to GNU make (using the --version option ensures 
    330 # this.) 
     345# Check for `mkdir -p'. 
    331346AC_DEFUN([AM_PROG_MKDIR_P], 
    332 [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 
    333   # We used to keeping the `.' as first argument, in order to 
    334   # allow $(mkdir_p) to be used without argument.  As in 
    335   #   $(mkdir_p) $(somedir) 
    336   # where $(somedir) is conditionally defined.  However this is wrong 
    337   # for two reasons: 
    338   #  1. if the package is installed by a user who cannot write `.' 
    339   #     make install will fail, 
    340   #  2. the above comment should most certainly read 
    341   #     $(mkdir_p) $(DESTDIR)$(somedir) 
    342   #     so it does not work when $(somedir) is undefined and 
    343   #     $(DESTDIR) is not. 
    344   #  To support the latter case, we have to write 
    345   #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), 
    346   #  so the `.' trick is pointless. 
    347   mkdir_p='mkdir -p --' 
    348 else 
    349   # On NextStep and OpenStep, the `mkdir' command does not 
    350   # recognize any option.  It will interpret all options as 
    351   # directories to create, and then abort because `.' already 
    352   # exists. 
    353   for d in ./-p ./--version; 
    354   do 
    355     test -d $d && rmdir $d 
    356   done 
    357   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. 
    358   if test -f "$ac_aux_dir/mkinstalldirs"; then 
    359     mkdir_p='$(mkinstalldirs)' 
    360   else 
    361     mkdir_p='$(install_sh) -d' 
    362   fi 
    363 fi 
    364 AC_SUBST([mkdir_p])]) 
     347[AC_PREREQ([2.60])dnl 
     348AC_REQUIRE([AC_PROG_MKDIR_P])dnl 
     349dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P, 
     350dnl while keeping a definition of mkdir_p for backward compatibility. 
     351dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. 
     352dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of 
     353dnl Makefile.ins that do not define MKDIR_P, so we do our own 
     354dnl adjustment using top_builddir (which is defined more often than 
     355dnl MKDIR_P). 
     356AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl 
     357case $mkdir_p in 
     358  [[\\/$]]* | ?:[[\\/]]*) ;; 
     359  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; 
     360esac 
     361]) 
    365362 
    366363# Helper functions for option handling.                     -*- Autoconf -*- 
     
    474471  AC_CHECK_TOOL([STRIP], [strip], :) 
    475472fi 
    476 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" 
     473INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" 
    477474AC_SUBST([INSTALL_STRIP_PROGRAM])]) 
     475 
     476# Copyright (C) 2006  Free Software Foundation, Inc. 
     477# 
     478# This file is free software; the Free Software Foundation 
     479# gives unlimited permission to copy and/or distribute it, 
     480# with or without modifications, as long as this notice is preserved. 
     481 
     482# _AM_SUBST_NOTMAKE(VARIABLE) 
     483# --------------------------- 
     484# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. 
     485# This macro is traced by Automake. 
     486AC_DEFUN([_AM_SUBST_NOTMAKE]) 
    478487 
    479488# Check how to create a tarball.                            -*- Autoconf -*- 
  • trunk/lib/compiler/gdc/configure

    r2938 r3153  
    666666INSTALL_SCRIPT 
    667667INSTALL_DATA 
     668am__isrc 
    668669CYGPATH_W 
    669670PACKAGE 
     
    19471948 
    19481949 
    1949 am__api_version="1.9" 
     1950am__api_version='1.10' 
     1951 
    19501952# Find a good install program.  We prefer a C program (faster), 
    19511953# so one script is as good as another.  But avoid the broken or 
     
    20992101fi 
    21002102 
    2101 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 
    2102   # We used to keeping the `.' as first argument, in order to 
    2103   # allow $(mkdir_p) to be used without argument.  As in 
    2104   #   $(mkdir_p) $(somedir) 
    2105   # where $(somedir) is conditionally defined.  However this is wrong 
    2106   # for two reasons: 
    2107   #  1. if the package is installed by a user who cannot write `.' 
    2108   #     make install will fail, 
    2109   #  2. the above comment should most certainly read 
    2110   #     $(mkdir_p) $(DESTDIR)$(somedir) 
    2111   #     so it does not work when $(somedir) is undefined and 
    2112   #     $(DESTDIR) is not. 
    2113   #  To support the latter case, we have to write 
    2114   #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), 
    2115   #  so the `.' trick is pointless. 
    2116   mkdir_p='mkdir -p --' 
    2117 else 
    2118   # On NextStep and OpenStep, the `mkdir' command does not 
    2119   # recognize any option.  It will interpret all options as 
    2120   # directories to create, and then abort because `.' already 
    2121   # exists. 
    2122   for d in ./-p ./--version; 
    2123   do 
    2124     test -d $d && rmdir $d 
    2125   done 
    2126   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. 
    2127   if test -f "$ac_aux_dir/mkinstalldirs"; then 
    2128     mkdir_p='$(mkinstalldirs)' 
     2103{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 
     2104echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } 
     2105if test -z "$MKDIR_P"; then 
     2106  if test "${ac_cv_path_mkdir+set}" = set; then 
     2107  echo $ECHO_N "(cached) $ECHO_C" >&6 
     2108else 
     2109  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     2110for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin 
     2111do 
     2112  IFS=$as_save_IFS 
     2113  test -z "$as_dir" && as_dir=. 
     2114  for ac_prog in mkdir gmkdir; do 
     2115     for ac_exec_ext in '' $ac_executable_extensions; do 
     2116       { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue 
     2117       case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 
     2118         'mkdir (GNU coreutils) '* | \ 
     2119         'mkdir (coreutils) '* | \ 
     2120         'mkdir (fileutils) '4.1*) 
     2121           ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext 
     2122           break 3;; 
     2123       esac 
     2124     done 
     2125       done 
     2126done 
     2127IFS=$as_save_IFS 
     2128 
     2129fi 
     2130 
     2131  if test "${ac_cv_path_mkdir+set}" = set; then 
     2132    MKDIR_P="$ac_cv_path_mkdir -p" 
    21292133  else 
    2130     mkdir_p='$(install_sh) -d' 
     2134    # As a last resort, use the slow shell script.  Don't cache a 
     2135    # value for MKDIR_P within a source directory, because that will 
     2136    # break other packages using the cache if that directory is 
     2137    # removed, or if the value is a relative name. 
     2138    test -d ./--version && rmdir ./--version 
     2139    MKDIR_P="$ac_install_sh -d" 
    21312140  fi 
    21322141fi 
     2142{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 
     2143echo "${ECHO_T}$MKDIR_P" >&6; } 
     2144 
     2145mkdir_p="$MKDIR_P" 
     2146case $mkdir_p in 
     2147  [\\/$]* | ?:[\\/]*) ;; 
     2148  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; 
     2149esac 
    21332150 
    21342151for ac_prog in gawk mawk nawk awk 
     
    22132230rmdir .tst 2>/dev/null 
    22142231 
    2215 # test to see if srcdir already configured 
    2216 if test "`cd $srcdir && pwd`" != "`pwd`" && 
    2217    test -f $srcdir/config.status; then 
    2218   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 
     2232if test "`cd $srcdir && pwd`" != "`pwd`"; then 
     2233  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output 
     2234  # is not polluted with repeated "-I." 
     2235  am__isrc=' -I$(srcdir)' 
     2236  # test to see if srcdir already configured 
     2237  if test -f $srcdir/config.status; then 
     2238    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 
    22192239echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} 
    22202240   { (exit 1); exit 1; }; } 
     2241  fi 
    22212242fi 
    22222243 
     
    22612282MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 
    22622283 
    2263 install_sh=${install_sh-"$am_aux_dir/install-sh"} 
     2284install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} 
    22642285 
    22652286# Installed binaries are usually stripped using `strip' when the user 
     
    23652386 
    23662387fi 
    2367 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" 
     2388INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" 
    23682389 
    23692390# We need awk for the "check" target.  The system "awk" is bad on 
     
    40254046  { echo "$as_me:$LINENO: result: no" >&5 
    40264047echo "${ECHO_T}no" >&6; } 
    4027   { { echo "$as_me:$LINENO: error: can't compile D sources!" >&5 
    4028 echo "$as_me: error: can't compile D sources!" >&2;} 
    4029    { (exit 1); exit 1; }; } 
     4048  #AC_MSG_ERROR([can't compile D sources!]) 
    40304049fi 
    40314050 
     
    97079726    fi 
    97089727fi 
    9709  
    9710  
    9711 if test "$D_GENERATE_FRAGMENTS" = "yes"; then 
     9728 if test "$D_GENERATE_FRAGMENTS" = "yes"; then 
    97129729  D_GENERATE_FRAGMENTS_TRUE= 
    97139730  D_GENERATE_FRAGMENTS_FALSE='#' 
     
    1018410201srcdir='$srcdir' 
    1018510202INSTALL='$INSTALL' 
     10203MKDIR_P='$MKDIR_P' 
    1018610204_ACEOF 
    1018710205 
     
    1040310421INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim 
    1040410422INSTALL_DATA!$INSTALL_DATA$ac_delim 
     10423am__isrc!$am__isrc$ac_delim 
    1040510424CYGPATH_W!$CYGPATH_W$ac_delim 
    1040610425PACKAGE!$PACKAGE$ac_delim 
     
    1044110460EGREP!$EGREP$ac_delim 
    1044210461D_EXTRA_OBJS!$D_EXTRA_OBJS$ac_delim 
    10443 D_PREREQ_SRCS!$D_PREREQ_SRCS$ac_delim 
    1044410462_ACEOF 
    1044510463 
     
    1049110509for ac_last_try in false false false false false :; do 
    1049210510  cat >conf$$subs.sed <<_ACEOF 
     10511D_PREREQ_SRCS!$D_PREREQ_SRCS$ac_delim 
    1049310512DCFG_TRUNC!$DCFG_TRUNC$ac_delim 
    1049410513DCFG_NEARBYINT!$DCFG_NEARBYINT$ac_delim 
     
    1052410543_ACEOF 
    1052510544 
    10526   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then 
     10545  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then 
    1052710546    break 
    1052810547  elif $ac_last_try; then 
     
    1075110770  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; 
    1075210771  esac 
     10772  ac_MKDIR_P=$MKDIR_P 
     10773  case $MKDIR_P in 
     10774  [\\/$]* | ?:[\\/]* ) ;; 
     10775  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; 
     10776  esac 
    1075310777_ACEOF 
    1075410778 
     
    1080410828s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 
    1080510829s&@INSTALL@&$ac_INSTALL&;t t 
     10830s&@MKDIR_P@&$ac_MKDIR_P&;t t 
    1080610831$ac_datarootdir_hack 
    1080710832" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out 
  • trunk/lib/compiler/gdc/configure.in

    r2938 r3153  
    183183else 
    184184  AC_MSG_RESULT([no]) 
    185   AC_MSG_ERROR([can't compile D sources!]) 
     185  #AC_MSG_ERROR([can't compile D sources!]) 
    186186fi 
    187187 
  • trunk/lib/install-gdc.sh

    r2465 r3153  
    2222  --uninstall: Uninstall tango, switch back to standard phobos.' 
    2323    exit 0 
    24 } 
     24} #' 
    2525 
    2626cd "`dirname $0`" 
     
    5959GPHOBOS_DIR="`${CROSS}gdc -print-file-name=libgphobos.a`" 
    6060GPHOBOS_DIR="`dirname $GPHOBOS_DIR`" 
     61 
    6162# If we have which, use it to get the prefix 
    6263which --version >& /dev/null 
     
    6869    PREFIX="$GPHOBOS_DIR/.." 
    6970fi 
     71 
     72# If libgphobos.a isn't installed, make it up 
     73if [ "$GPHOBOS_DIR" = "." ] 
     74then 
     75    GPHOBOS_DIR="$PREFIX/lib" 
     76fi 
     77 
    7078GDC_VER="`${CROSS}gdc -dumpversion`" 
    7179GDC_MCH="`${CROSS}gdc -dumpmachine`"