enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-html or --disable-html was given.
-if test "${enable_html+set}" = set; then
- enableval="$enable_html"
+ # Check whether --enable-richtext or --disable-richtext was given.
+if test "${enable_richtext+set}" = set; then
+ enableval="$enable_richtext"
if test "$enableval" = yes; then
- ac_cv_use_html='wxUSE_RICHTEXT=yes'
+ ac_cv_use_richtext='wxUSE_RICHTEXT=yes'
else
- ac_cv_use_html='wxUSE_RICHTEXT=no'
+ ac_cv_use_richtext='wxUSE_RICHTEXT=no'
fi
else
no_cache=1
fi
- ac_cv_use_html='wxUSE_RICHTEXT='$DEFAULT_wxUSE_RICHTEXT
+ ac_cv_use_richtext='wxUSE_RICHTEXT='$DEFAULT_wxUSE_RICHTEXT
fi;
- eval "$ac_cv_use_html"
+ eval "$ac_cv_use_richtext"
if test "$no_cache" != 1; then
- echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_richtext >> ${wx_arg_cache_file}.tmp
fi
if test "$wxUSE_RICHTEXT" = yes; then
fi
fi
-wants_win32=0
-doesnt_want_win32=0
-case "${host}" in
- *-*-cygwin*)
- if test "$wxUSE_MSW" = 1 ; then
- wants_win32=1
- BAKEFILE_FORCE_PLATFORM=win32
- else
- doesnt_want_win32=1
- fi
- ;;
- *-*-mingw*)
- wants_win32=1
- ;;
-esac
-
-if test "$wxUSE_WINE" = "yes"; then
- wants_win32=1
- CC=winegcc
- CXX=wineg++
- LDFLAGS_GUI="-mwindows"
-fi
-
-if test "$wants_win32" = 1 ; then
- USE_UNIX=0
- USE_WIN32=1
- cat >>confdefs.h <<\_ACEOF
-#define __WIN32__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __WIN95__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __WINDOWS__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __GNUWIN32__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define STRICT 1
-_ACEOF
-
-fi
-if test "$doesnt_want_win32" = 1 ; then
- USE_UNIX=1
- USE_WIN32=0
-fi
-
-if test "$USE_UNIX" = 1 ; then
- wxUSE_UNIX=yes
- cat >>confdefs.h <<\_ACEOF
-#define __UNIX__ 1
-_ACEOF
-
-fi
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
;;
esac
+wants_win32=0
+doesnt_want_win32=0
+case "${host}" in
+ *-*-cygwin*)
+ if test "$wxUSE_MSW" = 1 ; then
+ wants_win32=1
+ else
+ echo "$as_me:$LINENO: checking if -mno-cygwin is in effect" >&5
+echo $ECHO_N "checking if -mno-cygwin is in effect... $ECHO_C" >&6
+if test "${wx_cv_nocygwin+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. */
+
+int
+main ()
+{
+
+ #ifdef __MINGW32__
+ choke me
+ #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
+ wx_cv_nocygwin=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_nocygwin=yes
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_nocygwin" >&5
+echo "${ECHO_T}$wx_cv_nocygwin" >&6
+
+ if test "$wx_cv_nocygwin" = "yes"; then
+ wants_win32=1
+ else
+ doesnt_want_win32=1
+ fi
+ fi
+ if test "$wants_win32" = 1 ; then
+ BAKEFILE_FORCE_PLATFORM=win32
+ fi
+ ;;
+ *-*-mingw*)
+ wants_win32=1
+ ;;
+esac
+
+if test "$wxUSE_WINE" = "yes"; then
+ wants_win32=1
+ CC=winegcc
+ CXX=wineg++
+ LDFLAGS_GUI="-mwindows"
+fi
+
+if test "$wants_win32" = 1 ; then
+ USE_UNIX=0
+ USE_WIN32=1
+ cat >>confdefs.h <<\_ACEOF
+#define __WIN32__ 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define __WIN95__ 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define __WINDOWS__ 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define __GNUWIN32__ 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define STRICT 1
+_ACEOF
+
+fi
+if test "$doesnt_want_win32" = 1 ; then
+ USE_UNIX=1
+ USE_WIN32=0
+fi
+
+if test "$USE_UNIX" = 1 ; then
+ wxUSE_UNIX=yes
+ cat >>confdefs.h <<\_ACEOF
+#define __UNIX__ 1
+_ACEOF
+
+fi
+
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
ac_ext=c
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $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/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
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/libX11.$ac_extension; then
+ if test -r $ac_dir/libXt.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
fi
if test "$WXGTK20" = 1; then
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ PKG_CONFIG=""
+ fi
+
+fi
+
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
fi
fi
fi
-fi
-if test "$WXGTK20" = 1; then
if test "$wxUSE_MIMETYPE" = "yes" ; then
if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
fi
fi
fi
-fi
-if test "$WXGTK20" = 1; then
if test "$wxUSE_LIBHILDON" = "yes" ; then
pkg_failed=no
projects / wxWidgets.git / blobdiff