undo last change, as it breaks Win32 cross-compile
git-svn-id: https://svn.salfter.gotdns.org/svn/h264dvr/trunk@396 1b90f75b-8b96-4784-87c0-14078182fce6
This commit is contained in:
salfter
1064
aclocal.m4
vendored
1064
aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
280
configure
vendored
280
configure
vendored
@@ -610,19 +610,7 @@ LIBOBJS
|
||||
EGREP
|
||||
GREP
|
||||
CPP
|
||||
WX_VERSION_MICRO
|
||||
WX_VERSION_MINOR
|
||||
WX_VERSION_MAJOR
|
||||
WX_RESCOMP
|
||||
WX_VERSION
|
||||
WX_LIBS_STATIC
|
||||
WX_LIBS
|
||||
WX_CXXFLAGS_ONLY
|
||||
WX_CFLAGS_ONLY
|
||||
WX_CXXFLAGS
|
||||
WX_CFLAGS
|
||||
WX_CPPFLAGS
|
||||
WX_CONFIG_PATH
|
||||
RANLIB
|
||||
am__fastdepCC_FALSE
|
||||
am__fastdepCC_TRUE
|
||||
@@ -4303,272 +4291,8 @@ fi
|
||||
|
||||
# check for wxWidgets
|
||||
|
||||
reqwx=2.8.11
|
||||
|
||||
|
||||
if test x${WX_CONFIG_NAME+set} != xset ; then
|
||||
WX_CONFIG_NAME=wx-config
|
||||
fi
|
||||
|
||||
if test "x$wx_config_name" != x ; then
|
||||
WX_CONFIG_NAME="$wx_config_name"
|
||||
fi
|
||||
|
||||
if test x$wx_config_exec_prefix != x ; then
|
||||
wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
|
||||
WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
|
||||
fi
|
||||
if test x$wx_config_prefix != x ; then
|
||||
wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
|
||||
WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
|
||||
fi
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
wx_config_args="$wx_config_args --host=$host_alias"
|
||||
fi
|
||||
|
||||
if test -x "$WX_CONFIG_NAME" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5
|
||||
$as_echo_n "checking for wx-config... " >&6; }
|
||||
WX_CONFIG_PATH="$WX_CONFIG_NAME"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5
|
||||
$as_echo "$WX_CONFIG_PATH" >&6; }
|
||||
else
|
||||
# Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
|
||||
set dummy $WX_CONFIG_NAME; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_WX_CONFIG_PATH+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $WX_CONFIG_PATH in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
as_dummy=""$WX_LOOKUP_PATH:$PATH""
|
||||
for as_dir in $as_dummy
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
|
||||
if test -n "$WX_CONFIG_PATH"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5
|
||||
$as_echo "$WX_CONFIG_PATH" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test "$WX_CONFIG_PATH" != "no" ; then
|
||||
WX_VERSION=""
|
||||
|
||||
min_wx_version=$reqwx
|
||||
if test -z "" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5
|
||||
$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version ()" >&5
|
||||
$as_echo_n "checking for wxWidgets version >= $min_wx_version ()... " >&6; }
|
||||
fi
|
||||
|
||||
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args "
|
||||
|
||||
WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
|
||||
wx_config_major_version=`echo $WX_VERSION | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
wx_config_minor_version=`echo $WX_VERSION | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
wx_config_micro_version=`echo $WX_VERSION | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
||||
|
||||
wx_requested_major_version=`echo $min_wx_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
wx_requested_minor_version=`echo $min_wx_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
wx_requested_micro_version=`echo $min_wx_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
||||
|
||||
|
||||
wx_ver_ok=""
|
||||
if test "x$WX_VERSION" != x ; then
|
||||
if test $wx_config_major_version -gt $wx_requested_major_version; then
|
||||
wx_ver_ok=yes
|
||||
else
|
||||
if test $wx_config_major_version -eq $wx_requested_major_version; then
|
||||
if test $wx_config_minor_version -gt $wx_requested_minor_version; then
|
||||
wx_ver_ok=yes
|
||||
else
|
||||
if test $wx_config_minor_version -eq $wx_requested_minor_version; then
|
||||
if test $wx_config_micro_version -ge $wx_requested_micro_version; then
|
||||
wx_ver_ok=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test -n "$wx_ver_ok"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5
|
||||
$as_echo "yes (version $WX_VERSION)" >&6; }
|
||||
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs `
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5
|
||||
$as_echo_n "checking for wxWidgets static library... " >&6; }
|
||||
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
|
||||
if test "x$WX_LIBS_STATIC" = "x"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
fi
|
||||
|
||||
wx_has_cppflags=""
|
||||
if test $wx_config_major_version -gt 2; then
|
||||
wx_has_cppflags=yes
|
||||
else
|
||||
if test $wx_config_major_version -eq 2; then
|
||||
if test $wx_config_minor_version -gt 2; then
|
||||
wx_has_cppflags=yes
|
||||
else
|
||||
if test $wx_config_minor_version -eq 2; then
|
||||
if test $wx_config_micro_version -ge 6; then
|
||||
wx_has_cppflags=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
wx_has_rescomp=""
|
||||
if test $wx_config_major_version -gt 2; then
|
||||
wx_has_rescomp=yes
|
||||
else
|
||||
if test $wx_config_major_version -eq 2; then
|
||||
if test $wx_config_minor_version -ge 7; then
|
||||
wx_has_rescomp=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "x$wx_has_rescomp" = x ; then
|
||||
WX_RESCOMP=
|
||||
else
|
||||
WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
|
||||
fi
|
||||
|
||||
if test "x$wx_has_cppflags" = x ; then
|
||||
WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
|
||||
WX_CPPFLAGS=$WX_CFLAGS
|
||||
WX_CXXFLAGS=$WX_CFLAGS
|
||||
|
||||
WX_CFLAGS_ONLY=$WX_CFLAGS
|
||||
WX_CXXFLAGS_ONLY=$WX_CFLAGS
|
||||
else
|
||||
WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags `
|
||||
WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags `
|
||||
WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
|
||||
|
||||
WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
|
||||
WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
|
||||
fi
|
||||
|
||||
wxWin=1
|
||||
|
||||
else
|
||||
|
||||
if test "x$WX_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5
|
||||
$as_echo "no (version $WX_VERSION is not new enough)" >&6; }
|
||||
fi
|
||||
|
||||
WX_CFLAGS=""
|
||||
WX_CPPFLAGS=""
|
||||
WX_CXXFLAGS=""
|
||||
WX_LIBS=""
|
||||
WX_LIBS_STATIC=""
|
||||
WX_RESCOMP=""
|
||||
|
||||
if test ! -z ""; then
|
||||
|
||||
wx_error_message="
|
||||
The configuration you asked for $PACKAGE_NAME requires a wxWidgets
|
||||
build with the following settings:
|
||||
|
||||
but such build is not available.
|
||||
|
||||
To see the wxWidgets builds available on this system, please use
|
||||
'wx-config --list' command. To use the default build, returned by
|
||||
'wx-config --selected-config', use the options with their 'auto'
|
||||
default values."
|
||||
|
||||
fi
|
||||
|
||||
wx_error_message="
|
||||
The requested wxWidgets build couldn't be found.
|
||||
$wx_error_message
|
||||
|
||||
If you still get this error, then check that 'wx-config' is
|
||||
in path, the directory where wxWidgets libraries are installed
|
||||
(returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
|
||||
or equivalent variable and wxWidgets version is $reqwx or above."
|
||||
|
||||
as_fn_error $? "$wx_error_message" "$LINENO" 5
|
||||
|
||||
fi
|
||||
else
|
||||
|
||||
WX_CFLAGS=""
|
||||
WX_CPPFLAGS=""
|
||||
WX_CXXFLAGS=""
|
||||
WX_LIBS=""
|
||||
WX_LIBS_STATIC=""
|
||||
WX_RESCOMP=""
|
||||
|
||||
:
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
WX_VERSION_MAJOR="$wx_config_major_version"
|
||||
WX_VERSION_MINOR="$wx_config_minor_version"
|
||||
WX_VERSION_MICRO="$wx_config_micro_version"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#reqwx=2.8.11
|
||||
#AM_PATH_WXCONFIG($reqwx, wxWin=1)
|
||||
|
||||
WXCONFIG=wx-config
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ AC_PROG_RANLIB
|
||||
|
||||
# check for wxWidgets
|
||||
|
||||
reqwx=2.8.11
|
||||
AM_PATH_WXCONFIG($reqwx, wxWin=1)
|
||||
#reqwx=2.8.11
|
||||
#AM_PATH_WXCONFIG($reqwx, wxWin=1)
|
||||
|
||||
WXCONFIG=wx-config
|
||||
AC_ARG_WITH(wx-config,
|
||||
|
||||
Reference in New Issue
Block a user