Undo the link creation in builddir. contrib is still going to be
here for a while so there isn't much paydirt in working around the problems on platforms with limited filesystems at this stage. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
parent
6af167618f
commit
0506bbbfdf
148
configure
vendored
148
configure
vendored
@ -40908,10 +40908,6 @@ fi
|
||||
"
|
||||
|
||||
|
||||
ac_config_links="$ac_config_links include/wx-$WX_RELEASE$WX_FLAVOUR:include"
|
||||
|
||||
ac_config_links="$ac_config_links contrib/include"
|
||||
|
||||
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
@ -41495,9 +41491,6 @@ $config_files
|
||||
Configuration headers:
|
||||
$config_headers
|
||||
|
||||
Configuration links:
|
||||
$config_links
|
||||
|
||||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
@ -41625,8 +41618,6 @@ do
|
||||
"version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;;
|
||||
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;;
|
||||
"include/wx-$WX_RELEASE$WX_FLAVOUR" ) CONFIG_LINKS="$CONFIG_LINKS include/wx-$WX_RELEASE$WX_FLAVOUR:include" ;;
|
||||
"contrib/include" ) CONFIG_LINKS="$CONFIG_LINKS contrib/include" ;;
|
||||
"wx-config" ) CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
|
||||
"lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in" ;;
|
||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||
@ -41642,7 +41633,6 @@ done
|
||||
if $ac_need_defaults; then
|
||||
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
|
||||
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
|
||||
test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
|
||||
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
|
||||
fi
|
||||
|
||||
@ -42477,144 +42467,6 @@ done
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<\_ACEOF
|
||||
|
||||
#
|
||||
# CONFIG_LINKS section.
|
||||
#
|
||||
|
||||
for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
|
||||
ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
|
||||
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||||
|
||||
{ echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
|
||||
echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
|
||||
|
||||
if test ! -r $srcdir/$ac_source; then
|
||||
{ { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
|
||||
echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
rm -f $ac_dest
|
||||
|
||||
# Make relative symlinks.
|
||||
ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
|
||||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
X"$ac_dest" : 'X\(//\)[^/]' \| \
|
||||
X"$ac_dest" : 'X\(//\)$' \| \
|
||||
X"$ac_dest" : 'X\(/\)' \| \
|
||||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$ac_dest" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
{ if $as_mkdir_p; then
|
||||
mkdir -p "$ac_dest_dir"
|
||||
else
|
||||
as_dir="$ac_dest_dir"
|
||||
as_dirs=
|
||||
while test ! -d "$as_dir"; do
|
||||
as_dirs="$as_dir $as_dirs"
|
||||
as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
||||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
X"$as_dir" : 'X\(//\)[^/]' \| \
|
||||
X"$as_dir" : 'X\(//\)$' \| \
|
||||
X"$as_dir" : 'X\(/\)' \| \
|
||||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X"$as_dir" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
done
|
||||
test ! -n "$as_dirs" || mkdir $as_dirs
|
||||
fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
|
||||
echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
|
||||
{ (exit 1); exit 1; }; }; }
|
||||
|
||||
ac_builddir=.
|
||||
|
||||
if test "$ac_dest_dir" != .; then
|
||||
ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
|
||||
# A "../" for each directory in $ac_dir_suffix.
|
||||
ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
||||
else
|
||||
ac_dir_suffix= ac_top_builddir=
|
||||
fi
|
||||
|
||||
case $srcdir in
|
||||
.) # No --srcdir option. We are building in place.
|
||||
ac_srcdir=.
|
||||
if test -z "$ac_top_builddir"; then
|
||||
ac_top_srcdir=.
|
||||
else
|
||||
ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
||||
fi ;;
|
||||
[\\/]* | ?:[\\/]* ) # Absolute path.
|
||||
ac_srcdir=$srcdir$ac_dir_suffix;
|
||||
ac_top_srcdir=$srcdir ;;
|
||||
*) # Relative path.
|
||||
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
||||
ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
||||
esac
|
||||
|
||||
# Do not use `cd foo && pwd` to compute absolute paths, because
|
||||
# the directories may not exist.
|
||||
case `pwd` in
|
||||
.) ac_abs_builddir="$ac_dest_dir";;
|
||||
*)
|
||||
case "$ac_dest_dir" in
|
||||
.) ac_abs_builddir=`pwd`;;
|
||||
[\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
|
||||
*) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
|
||||
esac;;
|
||||
esac
|
||||
case $ac_abs_builddir in
|
||||
.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||||
*)
|
||||
case ${ac_top_builddir}. in
|
||||
.) ac_abs_top_builddir=$ac_abs_builddir;;
|
||||
[\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||||
*) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
||||
esac;;
|
||||
esac
|
||||
case $ac_abs_builddir in
|
||||
.) ac_abs_srcdir=$ac_srcdir;;
|
||||
*)
|
||||
case $ac_srcdir in
|
||||
.) ac_abs_srcdir=$ac_abs_builddir;;
|
||||
[\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
||||
*) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
||||
esac;;
|
||||
esac
|
||||
case $ac_abs_builddir in
|
||||
.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||||
*)
|
||||
case $ac_top_srcdir in
|
||||
.) ac_abs_top_srcdir=$ac_abs_builddir;;
|
||||
[\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||||
*) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
||||
esac;;
|
||||
esac
|
||||
|
||||
|
||||
case $srcdir in
|
||||
[\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
|
||||
*) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
|
||||
esac
|
||||
|
||||
# Try a symlink, then a hard link, then a copy.
|
||||
ln -s $ac_rel_source $ac_dest 2>/dev/null ||
|
||||
ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
|
||||
cp -p $srcdir/$ac_source $ac_dest ||
|
||||
{ { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
|
||||
echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
done
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<\_ACEOF
|
||||
|
||||
#
|
||||
# CONFIG_COMMANDS section.
|
||||
#
|
||||
|
||||
@ -6139,8 +6139,12 @@ AC_CONFIG_COMMANDS([ wx-config
|
||||
LN_S="${LN_S}"
|
||||
])
|
||||
|
||||
AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
|
||||
AC_CONFIG_LINKS([ contrib/include ])
|
||||
dnl This would give us us build dir that in every significant way
|
||||
dnl resembles an installed wx in prefix=$builddir. It is troublesome
|
||||
dnl though in this form because AC_CONFIG_LINKS will fail for directories
|
||||
dnl on platforms that do not have symlinks.
|
||||
dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
|
||||
dnl AC_CONFIG_LINKS([ contrib/include ])
|
||||
|
||||
|
||||
dnl Configure samples, contrib etc. directories, but only if they are present:
|
||||
|
||||
@ -14,13 +14,18 @@
|
||||
# local tree by default and then source the real wx-config if it all still
|
||||
# looks sane.
|
||||
|
||||
this_prefix=$( cd "@abs_top_builddir@" 2> /dev/null && pwd )
|
||||
|
||||
if [ -z "$this_prefix" ]; then
|
||||
printf "\n *** Error: Directory '@abs_top_builddir@'\n" 1>&2
|
||||
check_dirname()
|
||||
{
|
||||
if [ ! -d "$1" ]; then
|
||||
printf "\n *** Error: Directory '$1'\n" 1>&2
|
||||
printf " no longer exists.\n\n" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
( cd $1 && pwd )
|
||||
}
|
||||
|
||||
. "$this_prefix/lib/wx/config/@TOOLCHAIN_FULLNAME@"
|
||||
this_prefix=$(check_dirname "@abs_top_srcdir@") || exit
|
||||
this_exec_prefix=$(check_dirname "@abs_top_builddir@") || exit
|
||||
|
||||
. "$this_exec_prefix/lib/wx/config/@TOOLCHAIN_FULLNAME@"
|
||||
|
||||
|
||||
13
wx-config.in
13
wx-config.in
@ -311,7 +311,7 @@ get_mask()
|
||||
|
||||
# Determine the base directories we require.
|
||||
prefix=${input_option_prefix-${this_prefix:-@prefix@}}
|
||||
exec_prefix=${input_option_exec_prefix-${input_option_prefix-@exec_prefix@}}
|
||||
exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
|
||||
wxconfdir="@libdir@/wx/config"
|
||||
|
||||
installed_configs=$( cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-" )
|
||||
@ -708,7 +708,7 @@ fi
|
||||
# tree prefix to provide the correct output for using this
|
||||
# uninstalled wx build. Or put more simply:
|
||||
prefix=${this_prefix-$prefix}
|
||||
exec_prefix=${this_prefix-$exec_prefix}
|
||||
exec_prefix=${this_exec_prefix-$exec_prefix}
|
||||
|
||||
includedir="@includedir@"
|
||||
libdir="@libdir@"
|
||||
@ -883,9 +883,14 @@ fi
|
||||
|
||||
[ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@"
|
||||
[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
|
||||
[ -z "$this_prefix" ] || _intree_cppflags="-I${prefix}/contrib/include"
|
||||
|
||||
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@ -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" $_intree_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
|
||||
if [ -n "$this_prefix" ]; then
|
||||
_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
|
||||
else
|
||||
_include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
|
||||
fi
|
||||
|
||||
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
|
||||
|
||||
# now without further ado, we can answer these too.
|
||||
[ -z "$output_option_cppflags" ] || echo $_cppflags
|
||||
|
||||
Loading…
Reference in New Issue
Block a user