Regenerated after Qt build changes
This commit is contained in:
Cătălin Răceanu
parent
6b0d920c3f
commit
ca2860907e
46
configure
vendored
46
configure
vendored
@ -1040,6 +1040,7 @@ infodir
|
||||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
@ -1460,6 +1461,7 @@ datadir='${datarootdir}'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
@ -1712,6 +1714,15 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@ -1849,7 +1860,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@ -2002,6 +2013,7 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
@ -3991,7 +4003,7 @@ case "${host}" in
|
||||
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
*-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
|
||||
PROGRAM_EXT=".exe"
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
;;
|
||||
@ -27002,6 +27014,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
|
||||
if test "$wxUSE_QT" = 1; then
|
||||
TOOLKIT=QT
|
||||
GUIDIST=QT_DIST
|
||||
TOOLKIT_DIR="qt"
|
||||
|
||||
if test -n "$QT5_CUSTOM_DIR" ; then
|
||||
TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} -I${QT5_CUSTOM_DIR}/include"
|
||||
GUI_TK_LIBRARY="${GUI_TK_LIBRARY} -L${QT5_CUSTOM_DIR}/lib \
|
||||
-lQt5Core -lQt5Widgets -lQt5Gui -lQt5OpenGL -lQt5Test \
|
||||
-Wl,-rpath,${QT5_CUSTOM_DIR}/lib"
|
||||
|
||||
elif test -z "$PKG_CONFIG" ; then
|
||||
as_fn_error $? "specify QT5_CUSTOM_DIR or make sure pkg-config is available to search for Qt5 libraries" "$LINENO" 5
|
||||
|
||||
else
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5
|
||||
@ -27062,12 +27088,12 @@ fi
|
||||
echo "$QT5_PKG_ERRORS" >&5
|
||||
|
||||
|
||||
as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
|
||||
as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
|
||||
|
||||
|
||||
elif test $pkg_failed = untried; then
|
||||
|
||||
as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
|
||||
as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
|
||||
|
||||
|
||||
else
|
||||
@ -27076,9 +27102,6 @@ else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
TOOLKIT=QT
|
||||
GUIDIST=QT_DIST
|
||||
TOOLKIT_DIR="qt"
|
||||
TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} ${QT5_CFLAGS}"
|
||||
GUI_TK_LIBRARY="${GUI_TK_LIBRARY} ${QT5_LIBS}"
|
||||
if `pkg-config --variable qt_config Qt5Core | grep "reduce_relocations" >/dev/null`; then
|
||||
@ -27087,6 +27110,7 @@ $as_echo "yes" >&6; }
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'`
|
||||
|
||||
@ -29855,7 +29879,7 @@ EOF
|
||||
HEADER_PAD_OPTION="-headerpad_max_install_names"
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
*-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
|
||||
;;
|
||||
|
||||
*-*-hpux* )
|
||||
@ -39632,7 +39656,7 @@ fi
|
||||
|
||||
LDFLAGS_GUI=
|
||||
case ${BAKEFILE_HOST} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
*-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
|
||||
LDFLAGS_GUI="-mwindows"
|
||||
esac
|
||||
|
||||
@ -40066,7 +40090,7 @@ fi
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
*-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
|
||||
PIC_FLAG=""
|
||||
SHARED_LD_CC="\$(CC) -shared -o"
|
||||
SHARED_LD_CXX="\$(CXX) -shared -o"
|
||||
@ -40311,7 +40335,7 @@ EOF
|
||||
|
||||
|
||||
case ${BAKEFILE_HOST} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
*-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}windres; ac_word=$2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user