mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Support non-standard target names
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3509 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
b49b6913d9
commit
490c248222
3 changed files with 108 additions and 4 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Sat Jan 2 12:48:51 1999 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* configure.in: Configure subdir src/mframe properly using
|
||||
AC_CONFIG_SUBDIRS
|
||||
|
||||
Sat Dec 26 8:20:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* src/NSString.m: Make compare with range of length zero always return
|
||||
|
|
|
|||
101
configure
vendored
101
configure
vendored
|
|
@ -3097,6 +3097,9 @@ esac
|
|||
|
||||
|
||||
|
||||
subdirs="src/mframe"
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -3256,6 +3259,7 @@ s%@DYNAMIC_LINKER@%$DYNAMIC_LINKER%g
|
|||
s%@DLLTOOL@%$DLLTOOL%g
|
||||
s%@whole_archive@%$whole_archive%g
|
||||
s%@no_whole_archive@%$no_whole_archive%g
|
||||
s%@subdirs@%$subdirs%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
|
@ -3470,7 +3474,100 @@ chmod +x $CONFIG_STATUS
|
|||
rm -fr confdefs* $ac_clean_files
|
||||
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
|
||||
|
||||
if test "$no_recursion" != yes; then
|
||||
|
||||
echo "Running 'configure' in src/mframe"
|
||||
(cd src/mframe; ./configure)
|
||||
# Remove --cache-file and --srcdir arguments so they do not pile up.
|
||||
ac_sub_configure_args=
|
||||
ac_prev=
|
||||
for ac_arg in $ac_configure_args; do
|
||||
if test -n "$ac_prev"; then
|
||||
ac_prev=
|
||||
continue
|
||||
fi
|
||||
case "$ac_arg" in
|
||||
-cache-file | --cache-file | --cache-fil | --cache-fi \
|
||||
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
|
||||
ac_prev=cache_file ;;
|
||||
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
|
||||
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
|
||||
;;
|
||||
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
|
||||
ac_prev=srcdir ;;
|
||||
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
|
||||
;;
|
||||
*) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
for ac_config_dir in src/mframe; do
|
||||
|
||||
# Do not complain, so a configure script can configure whichever
|
||||
# parts of a large source tree are present.
|
||||
if test ! -d $srcdir/$ac_config_dir; then
|
||||
continue
|
||||
fi
|
||||
|
||||
echo configuring in $ac_config_dir
|
||||
|
||||
case "$srcdir" in
|
||||
.) ;;
|
||||
*)
|
||||
if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
|
||||
else
|
||||
{ echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
ac_popdir=`pwd`
|
||||
cd $ac_config_dir
|
||||
|
||||
# A "../" for each directory in /$ac_config_dir.
|
||||
ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
|
||||
|
||||
case "$srcdir" in
|
||||
.) # No --srcdir option. We are building in place.
|
||||
ac_sub_srcdir=$srcdir ;;
|
||||
/*) # Absolute path.
|
||||
ac_sub_srcdir=$srcdir/$ac_config_dir ;;
|
||||
*) # Relative path.
|
||||
ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
|
||||
esac
|
||||
|
||||
# Check for guested configure; otherwise get Cygnus style configure.
|
||||
if test -f $ac_sub_srcdir/configure; then
|
||||
ac_sub_configure=$ac_sub_srcdir/configure
|
||||
elif test -f $ac_sub_srcdir/configure.in; then
|
||||
ac_sub_configure=$ac_configure
|
||||
else
|
||||
echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
|
||||
ac_sub_configure=
|
||||
fi
|
||||
|
||||
# The recursion is here.
|
||||
if test -n "$ac_sub_configure"; then
|
||||
|
||||
# Make the cache file name correct relative to the subdirectory.
|
||||
case "$cache_file" in
|
||||
/*) ac_sub_cache_file=$cache_file ;;
|
||||
*) # Relative path.
|
||||
ac_sub_cache_file="$ac_dots$cache_file" ;;
|
||||
esac
|
||||
|
||||
echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
|
||||
# The eval makes quoting arguments work.
|
||||
if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
|
||||
then :
|
||||
else
|
||||
{ echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
cd $ac_popdir
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
#echo "Running 'configure' in src/mframe"
|
||||
#(cd src/mframe; ./configure)
|
||||
|
||||
|
|
|
|||
|
|
@ -350,13 +350,15 @@ esac
|
|||
AC_SUBST(whole_archive)
|
||||
AC_SUBST(no_whole_archive)
|
||||
|
||||
AC_CONFIG_SUBDIRS(src/mframe)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
AC_OUTPUT(config.mak)
|
||||
|
||||
echo "Running 'configure' in src/mframe"
|
||||
(cd src/mframe; ./configure)
|
||||
#echo "Running 'configure' in src/mframe"
|
||||
#(cd src/mframe; ./configure)
|
||||
|
||||
dnl Local Variables:
|
||||
dnl comment-start: "dnl "
|
||||
|
|
|
|||
Loading…
Reference in a new issue