tidy up configure output, don't show gnomeprint/vfs/hildon for non-GTK ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
86508681d4
commit
c2e9ada498
216
configure
vendored
216
configure
vendored
@ -28758,7 +28758,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xlib.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
@ -28785,7 +28785,7 @@ else
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
for ac_dir in $ac_x_header_dirs; do
|
||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
if test -r "$ac_dir/X11/Xlib.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
@ -28799,18 +28799,18 @@ if test "$ac_x_libraries" = no; then
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lXt $LIBS"
|
||||
LIBS="-lX11 $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xlib.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XtMalloc (0)
|
||||
XrmInitialize ()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@ -28848,7 +28848,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
||||
do
|
||||
# Don't even attempt the hair of trying to link an X program!
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/libXt.$ac_extension; then
|
||||
if test -r $ac_dir/libX11.$ac_extension; then
|
||||
ac_x_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
@ -35045,6 +35045,182 @@ done
|
||||
fi
|
||||
|
||||
|
||||
for ac_func in round
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define $ac_func innocuous_$ac_func
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func (); below.
|
||||
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
<limits.h> exists even on freestanding compilers. */
|
||||
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#undef $ac_func
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char $ac_func ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
||||
choke me
|
||||
#else
|
||||
char (*f) () = $ac_func;
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return f != $ac_func;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_var=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_var=no"
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
if test "$ac_cv_func_round" = yes; then
|
||||
echo "$as_me:$LINENO: checking whether round is declared" >&5
|
||||
echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6
|
||||
if test "${ac_cv_have_decl_round+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <math.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef round
|
||||
char *p = (char *) round;
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_have_decl_round=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_have_decl_round=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_have_decl_round" >&5
|
||||
echo "${ECHO_T}$ac_cv_have_decl_round" >&6
|
||||
if test $ac_cv_have_decl_round = yes; then
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_DECL_ROUND 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
else
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_DECL_ROUND 0
|
||||
_ACEOF
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
|
||||
|
||||
@ -45698,14 +45874,31 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
|
||||
|
||||
case "$TOOLKIT" in
|
||||
GTK)
|
||||
TOOLKIT_USER="GTK+"
|
||||
TOOLKIT_DESC="GTK+"
|
||||
if test "$WXGTK20" = 1; then
|
||||
TOOLKIT_USER="$TOOLKIT_USER 2"
|
||||
TOOLKIT_DESC="$TOOLKIT_DESC 2"
|
||||
if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
|
||||
TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
|
||||
fi
|
||||
if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
|
||||
TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs"
|
||||
fi
|
||||
if test "$wxUSE_LIBHILDON" = "yes"; then
|
||||
TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_EXTRA" != ""; then
|
||||
TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
?*)
|
||||
TOOLKIT_DESC=$TOOLKIT_LOWERCASE
|
||||
;;
|
||||
|
||||
*)
|
||||
TOOLKIT_USER=$TOOLKIT_LOWERCASE
|
||||
TOOLKIT_DESC="base only"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -50772,7 +50965,7 @@ fi
|
||||
echo
|
||||
echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
|
||||
echo ""
|
||||
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_USER:-base only}"
|
||||
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
|
||||
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
|
||||
|
||||
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
|
||||
@ -50796,9 +50989,6 @@ echo " odbc ${wxUSE_ODBC}"
|
||||
echo " expat ${wxUSE_EXPAT}"
|
||||
echo " libmspack ${wxUSE_LIBMSPACK}"
|
||||
echo " sdl ${wxUSE_LIBSDL}"
|
||||
echo " gnomeprint ${wxUSE_LIBGNOMEPRINT-none}"
|
||||
echo " gnomevfs ${wxUSE_LIBGNOMEVFS-none}"
|
||||
echo " hildon ${wxUSE_LIBHILDON-none}"
|
||||
|
||||
echo ""
|
||||
|
||||
|
||||
28
configure.in
28
configure.in
@ -7330,14 +7330,31 @@ AC_SUBST(CPPUNIT_LIBS)
|
||||
|
||||
case "$TOOLKIT" in
|
||||
GTK)
|
||||
TOOLKIT_USER="GTK+"
|
||||
TOOLKIT_DESC="GTK+"
|
||||
if test "$WXGTK20" = 1; then
|
||||
TOOLKIT_USER="$TOOLKIT_USER 2"
|
||||
TOOLKIT_DESC="$TOOLKIT_DESC 2"
|
||||
if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
|
||||
TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
|
||||
fi
|
||||
if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
|
||||
TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs"
|
||||
fi
|
||||
if test "$wxUSE_LIBHILDON" = "yes"; then
|
||||
TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_EXTRA" != ""; then
|
||||
TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
?*)
|
||||
TOOLKIT_DESC=$TOOLKIT_LOWERCASE
|
||||
;;
|
||||
|
||||
*)
|
||||
TOOLKIT_USER=$TOOLKIT_LOWERCASE
|
||||
TOOLKIT_DESC="base only"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -7643,7 +7660,7 @@ dnl report how we have been configured
|
||||
echo
|
||||
echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
|
||||
echo ""
|
||||
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_USER:-base only}"
|
||||
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
|
||||
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
|
||||
|
||||
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
|
||||
@ -7667,9 +7684,6 @@ echo " odbc ${wxUSE_ODBC}"
|
||||
echo " expat ${wxUSE_EXPAT}"
|
||||
echo " libmspack ${wxUSE_LIBMSPACK}"
|
||||
echo " sdl ${wxUSE_LIBSDL}"
|
||||
echo " gnomeprint ${wxUSE_LIBGNOMEPRINT-none}"
|
||||
echo " gnomevfs ${wxUSE_LIBGNOMEVFS-none}"
|
||||
echo " hildon ${wxUSE_LIBHILDON-none}"
|
||||
|
||||
echo ""
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user