Mercurial > hg > release > icedtea-1.10
changeset 800:be4fb2d0fe2c cacao
2008-02-07 Lillian Angel <langel@redhat.com>
* Makefile.in: Regenerate.
* acinclude.m4: Removed FIND_FREETYPE2 and CHECK_HEADERS block.
* configure: Regenerate.
* configure.ac: Added pkg-config check for all packages using
pkg-config.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Thu, 07 Feb 2008 13:19:13 -0500 |
| parents | 341e02e1aab6 |
| children | fafdbc8e2794 |
| files | ChangeLog Makefile.in acinclude.m4 configure configure.ac |
| diffstat | 5 files changed, 970 insertions(+), 963 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 07 10:27:32 2008 -0500 +++ b/ChangeLog Thu Feb 07 13:19:13 2008 -0500 @@ -1,3 +1,11 @@ +2008-02-07 Lillian Angel <langel@redhat.com> + + * Makefile.in: Regenerate. + * acinclude.m4: Removed FIND_FREETYPE2 and CHECK_HEADERS block. + * configure: Regenerate. + * configure.ac: Added pkg-config check for all packages using + pkg-config. + 2008-02-07 Joshua Sumali <jsumali@redhat.com> * README: Updated NetX information.
--- a/Makefile.in Thu Feb 07 10:27:32 2008 -0500 +++ b/Makefile.in Thu Feb 07 13:19:13 2008 -0500 @@ -68,6 +68,8 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ @@ -98,7 +100,8 @@ EXEEXT = @EXEEXT@ FASTJAR = @FASTJAR@ FIND = @FIND@ -FREETYPE2_INC_DIR = @FREETYPE2_INC_DIR@ +FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ +FREETYPE2_LIBS = @FREETYPE2_LIBS@ GAWK = @GAWK@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -118,6 +121,8 @@ LDFLAGS = @LDFLAGS@ LIBGCJ_JAR = @LIBGCJ_JAR@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -145,9 +150,21 @@ SYSTEM_ICEDTEA_DIR = @SYSTEM_ICEDTEA_DIR@ UNZIP = @UNZIP@ VERSION = @VERSION@ +X11_CFLAGS = @X11_CFLAGS@ +X11_LIBS = @X11_LIBS@ XALAN2_JAR = @XALAN2_JAR@ XALAN2_SERIALIZER_JAR = @XALAN2_SERIALIZER_JAR@ XERCES2_JAR = @XERCES2_JAR@ +XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ +XINERAMA_LIBS = @XINERAMA_LIBS@ +XPROTO_CFLAGS = @XPROTO_CFLAGS@ +XPROTO_LIBS = @XPROTO_LIBS@ +XP_CFLAGS = @XP_CFLAGS@ +XP_LIBS = @XP_LIBS@ +XTST_CFLAGS = @XTST_CFLAGS@ +XTST_LIBS = @XTST_LIBS@ +XT_CFLAGS = @XT_CFLAGS@ +XT_LIBS = @XT_LIBS@ ZIP = @ZIP@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@
--- a/acinclude.m4 Thu Feb 07 10:27:32 2008 -0500 +++ b/acinclude.m4 Thu Feb 07 13:19:13 2008 -0500 @@ -487,31 +487,6 @@ AC_SUBST(XERCES2_JAR) ]) -AC_DEFUN([CHECK_HEADERS], -[ - AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[],[AC_MSG_ERROR("CUPS headers were not found - try installing cups-devel.")]) - AC_CHECK_HEADERS([X11/X.h X11/Xproto.h],[],[AC_MSG_ERROR("xorg headers were not found - try installing xorg-x11-proto-devel.")]) - AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],[],[AC_MSG_ERROR("libX11 headers were not found - try installing libX11-devel.")]) - AC_CHECK_HEADERS([X11/Intrinsic.h X11/Shell.h X11/StringDefs.h],[],[AC_MSG_ERROR("libXt headers were not found - try installing libXt-devel.")]) - AC_CHECK_HEADERS(X11/extensions/Print.h,[],[AC_MSG_ERROR("libXp headers were not found - try installing libXp-devel.")]) - AC_CHECK_HEADERS([Xm/Xm.h Xm/XmP.h Xm/Display.h],[],[AC_MSG_ERROR("motif headers were not found - try installing lesstif-devel.")]) - AC_CHECK_HEADERS([alsa/asoundlib.h],[],[AC_MSG_ERROR("ALSA headers were not found - try installing alsa-lib-devel.")]) -]) - -AC_DEFUN([FIND_FREETYPE], -[ - AC_CHECK_LIB(freetype, FT_Init_FreeType, [], [AC_MSG_ERROR("Freetype not found - try installing freetype-devel")]) - AC_MSG_CHECKING(for freetype header directory) - if test -d "/usr/include/freetype2"; then - FREETYPE2_INC_DIR=/usr/include/freetype2 - AC_MSG_RESULT(${FREETYPE2_INC_DIR}) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR("Freetype headers not found - try installing freetype-devel") - fi - AC_SUBST(FREETYPE2_INC_DIR) -]) - AC_DEFUN([ENABLE_FAST_BUILD], [ AC_ARG_ENABLE([fast-build],
--- a/configure Thu Feb 07 10:27:32 2008 -0500 +++ b/configure Thu Feb 07 13:19:13 2008 -0500 @@ -733,7 +733,6 @@ XALAN2_JAR XALAN2_SERIALIZER_JAR XERCES2_JAR -FREETYPE2_INC_DIR USE_ALT_OPENJDK_SRC_ZIP_TRUE USE_ALT_OPENJDK_SRC_ZIP_FALSE ALT_OPENJDK_SRC_ZIP @@ -750,6 +749,24 @@ GREP EGREP PKG_CONFIG +XPROTO_CFLAGS +XPROTO_LIBS +XT_CFLAGS +XT_LIBS +XP_CFLAGS +XP_LIBS +X11_CFLAGS +X11_LIBS +XINERAMA_CFLAGS +XINERAMA_LIBS +LIBPNG_CFLAGS +LIBPNG_LIBS +XTST_CFLAGS +XTST_LIBS +FREETYPE2_CFLAGS +FREETYPE2_LIBS +ALSA_CFLAGS +ALSA_LIBS MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS @@ -772,6 +789,24 @@ CCC CPP PKG_CONFIG +XPROTO_CFLAGS +XPROTO_LIBS +XT_CFLAGS +XT_LIBS +XP_CFLAGS +XP_LIBS +X11_CFLAGS +X11_LIBS +XINERAMA_CFLAGS +XINERAMA_LIBS +LIBPNG_CFLAGS +LIBPNG_LIBS +XTST_CFLAGS +XTST_LIBS +FREETYPE2_CFLAGS +FREETYPE2_LIBS +ALSA_CFLAGS +ALSA_LIBS MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS @@ -1400,6 +1435,30 @@ CXXFLAGS C++ compiler flags CPP C preprocessor PKG_CONFIG path to pkg-config utility + XPROTO_CFLAGS + C compiler flags for XPROTO, overriding pkg-config + XPROTO_LIBS linker flags for XPROTO, overriding pkg-config + XT_CFLAGS C compiler flags for XT, overriding pkg-config + XT_LIBS linker flags for XT, overriding pkg-config + XP_CFLAGS C compiler flags for XP, overriding pkg-config + XP_LIBS linker flags for XP, overriding pkg-config + X11_CFLAGS C compiler flags for X11, overriding pkg-config + X11_LIBS linker flags for X11, overriding pkg-config + XINERAMA_CFLAGS + C compiler flags for XINERAMA, overriding pkg-config + XINERAMA_LIBS + linker flags for XINERAMA, overriding pkg-config + LIBPNG_CFLAGS + C compiler flags for LIBPNG, overriding pkg-config + LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config + XTST_CFLAGS C compiler flags for XTST, overriding pkg-config + XTST_LIBS linker flags for XTST, overriding pkg-config + FREETYPE2_CFLAGS + C compiler flags for FREETYPE2, overriding pkg-config + FREETYPE2_LIBS + linker flags for FREETYPE2, overriding pkg-config + ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config + ALSA_LIBS linker flags for ALSA, overriding pkg-config MOZILLA_CFLAGS C compiler flags for MOZILLA, overriding pkg-config MOZILLA_LIBS @@ -6789,98 +6848,6 @@ fi - - -{ echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 -echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; } -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfreetype $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char FT_Init_FreeType (); -int -main () -{ -return FT_Init_FreeType (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_freetype_FT_Init_FreeType=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_freetype_FT_Init_FreeType=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 -echo "${ECHO_T}$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } -if test $ac_cv_lib_freetype_FT_Init_FreeType = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBFREETYPE 1 -_ACEOF - - LIBS="-lfreetype $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"Freetype not found - try installing freetype-devel\"" >&5 -echo "$as_me: error: \"Freetype not found - try installing freetype-devel\"" >&2;} - { (exit 1); exit 1; }; } -fi - - { echo "$as_me:$LINENO: checking for freetype header directory" >&5 -echo $ECHO_N "checking for freetype header directory... $ECHO_C" >&6; } - if test -d "/usr/include/freetype2"; then - FREETYPE2_INC_DIR=/usr/include/freetype2 - { echo "$as_me:$LINENO: result: ${FREETYPE2_INC_DIR}" >&5 -echo "${ECHO_T}${FREETYPE2_INC_DIR}" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: \"Freetype headers not found - try installing freetype-devel\"" >&5 -echo "$as_me: error: \"Freetype headers not found - try installing freetype-devel\"" >&2;} - { (exit 1); exit 1; }; } - fi - - - { echo "$as_me:$LINENO: checking openjdk source zip" >&5 echo $ECHO_N "checking openjdk source zip... $ECHO_C" >&6; } @@ -7128,6 +7095,7 @@ fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7766,7 +7734,6 @@ - for ac_header in cups/cups.h cups/ppd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -7907,167 +7874,19 @@ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else - { { echo "$as_me:$LINENO: error: \"CUPS headers were not found - try installing cups-devel.\"" >&5 -echo "$as_me: error: \"CUPS headers were not found - try installing cups-devel.\"" >&2;} + +else + { { echo "$as_me:$LINENO: error: \"CUPS headers were not found - + try installing cups-devel.\"" >&5 +echo "$as_me: error: \"CUPS headers were not found - + try installing cups-devel.\"" >&2;} { (exit 1); exit 1; }; } fi done - -for ac_header in X11/X.h X11/Xproto.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to fitzsim@redhat.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: \"xorg headers were not found - try installing xorg-x11-proto-devel.\"" >&5 -echo "$as_me: error: \"xorg headers were not found - try installing xorg-x11-proto-devel.\"" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - - -for ac_header in X11/Xlib.h X11/Xutil.h +for ac_header in X11/X.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -8207,309 +8026,12 @@ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else - { { echo "$as_me:$LINENO: error: \"libX11 headers were not found - try installing libX11-devel.\"" >&5 -echo "$as_me: error: \"libX11 headers were not found - try installing libX11-devel.\"" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - - - -for ac_header in X11/Intrinsic.h X11/Shell.h X11/StringDefs.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to fitzsim@redhat.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: \"libXt headers were not found - try installing libXt-devel.\"" >&5 -echo "$as_me: error: \"libXt headers were not found - try installing libXt-devel.\"" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - -for ac_header in X11/extensions/Print.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to fitzsim@redhat.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: \"libXp headers were not found - try installing libXp-devel.\"" >&5 -echo "$as_me: error: \"libXp headers were not found - try installing libXp-devel.\"" >&2;} + +else + { { echo "$as_me:$LINENO: error: \"xorg headers were not found - + try installing xorg-x11-proto-devel.\"" >&5 +echo "$as_me: error: \"xorg headers were not found - + try installing xorg-x11-proto-devel.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -8658,385 +8180,18 @@ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else - { { echo "$as_me:$LINENO: error: \"motif headers were not found - try installing lesstif-devel.\"" >&5 -echo "$as_me: error: \"motif headers were not found - try installing lesstif-devel.\"" >&2;} - { (exit 1); exit 1; }; } -fi - -done - - -for ac_header in alsa/asoundlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to fitzsim@redhat.com ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - { { echo "$as_me:$LINENO: error: \"ALSA headers were not found - try installing alsa-lib-devel.\"" >&5 -echo "$as_me: error: \"ALSA headers were not found - try installing alsa-lib-devel.\"" >&2;} + +else + { { echo "$as_me:$LINENO: error: \"motif headers were not found - + try installing lesstif-devel.\"" >&5 +echo "$as_me: error: \"motif headers were not found - + try installing lesstif-devel.\"" >&2;} { (exit 1); exit 1; }; } fi done - - -{ echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 -echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xtst_XTestQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXtst $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XTestQueryExtension (); -int -main () -{ -return XTestQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xtst_XTestQueryExtension=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xtst_XTestQueryExtension=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xtst_XTestQueryExtension" >&6; } -if test $ac_cv_lib_Xtst_XTestQueryExtension = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXTST 1 -_ACEOF - - LIBS="-lXtst $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"libXtst not found - try installing libXtst-devel\"" >&5 -echo "$as_me: error: \"libXtst not found - try installing libXtst-devel\"" >&2;} - { (exit 1); exit 1; }; } -fi - - -{ echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 -echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXinerama $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XineramaQueryExtension (); -int -main () -{ -return XineramaQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xinerama_XineramaQueryExtension=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xinerama_XineramaQueryExtension=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } -if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXINERAMA 1 -_ACEOF - - LIBS="-lXinerama $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"libXinerama not found - try installing libXinerama-devel\"" >&5 -echo "$as_me: error: \"libXinerama not found - try installing libXinerama-devel\"" >&2;} - { (exit 1); exit 1; }; } -fi - - -{ echo "$as_me:$LINENO: checking for main in -lpng" >&5 -echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5 -echo "${ECHO_T}$ac_cv_lib_png_main" >&6; } -if test $ac_cv_lib_png_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPNG 1 -_ACEOF - - LIBS="-lpng $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"libpng not found - try installing libpng-devel\"" >&5 -echo "$as_me: error: \"libpng not found - try installing libpng-devel\"" >&2;} - { (exit 1); exit 1; }; } -fi - - { echo "$as_me:$LINENO: checking for main in -ljpeg" >&5 echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_main+set}" = set; then @@ -9244,7 +8399,6 @@ fi -if test "$ENABLE_PLUGIN" = "yes"; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -9367,6 +8521,748 @@ fi pkg_failed=no +{ echo "$as_me:$LINENO: checking for XPROTO" >&5 +echo $ECHO_N "checking for XPROTO... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XPROTO_CFLAGS"; then + pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5 + ($PKG_CONFIG --exists --print-errors "xproto") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XPROTO_CFLAGS=`$PKG_CONFIG --cflags "xproto" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XPROTO_LIBS"; then + pkg_cv_XPROTO_LIBS="$XPROTO_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5 + ($PKG_CONFIG --exists --print-errors "xproto") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XPROTO_LIBS=`$PKG_CONFIG --libs "xproto" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"` + else + XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XPROTO_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + XPROTO_FOUND=no +elif test $pkg_failed = untried; then + XPROTO_FOUND=no +else + XPROTO_CFLAGS=$pkg_cv_XPROTO_CFLAGS + XPROTO_LIBS=$pkg_cv_XPROTO_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + XPROTO_FOUND=yes +fi +if test "x${XPROTO_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find Xproto headers - \ + Try installing xorg-x11-proto-devel." >&5 +echo "$as_me: error: Could not find Xproto headers - \ + Try installing xorg-x11-proto-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for XT" >&5 +echo $ECHO_N "checking for XT... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XT_CFLAGS"; then + pkg_cv_XT_CFLAGS="$XT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5 + ($PKG_CONFIG --exists --print-errors "xt") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XT_LIBS"; then + pkg_cv_XT_LIBS="$XT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5 + ($PKG_CONFIG --exists --print-errors "xt") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"` + else + XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XT_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + XT_FOUND=no +elif test $pkg_failed = untried; then + XT_FOUND=no +else + XT_CFLAGS=$pkg_cv_XT_CFLAGS + XT_LIBS=$pkg_cv_XT_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + XT_FOUND=yes +fi +if test "x${XT_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find Xt - \ + Try installing libXt-devel." >&5 +echo "$as_me: error: Could not find Xt - \ + Try installing libXt-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for XP" >&5 +echo $ECHO_N "checking for XP... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XP_CFLAGS"; then + pkg_cv_XP_CFLAGS="$XP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5 + ($PKG_CONFIG --exists --print-errors "xp") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XP_LIBS"; then + pkg_cv_XP_LIBS="$XP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5 + ($PKG_CONFIG --exists --print-errors "xp") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xp"` + else + XP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xp"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XP_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + XP_FOUND=no +elif test $pkg_failed = untried; then + XP_FOUND=no +else + XP_CFLAGS=$pkg_cv_XP_CFLAGS + XP_LIBS=$pkg_cv_XP_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + XP_FOUND=yes +fi +if test "x${XP_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find Xp - \ + Try installing libXp-devel." >&5 +echo "$as_me: error: Could not find Xp - \ + Try installing libXp-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for X11" >&5 +echo $ECHO_N "checking for X11... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$X11_CFLAGS"; then + pkg_cv_X11_CFLAGS="$X11_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$X11_LIBS"; then + pkg_cv_X11_LIBS="$X11_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` + else + X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` + fi + # Put the nasty error message in config.log where it belongs + echo "$X11_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + X11_FOUND=no +elif test $pkg_failed = untried; then + X11_FOUND=no +else + X11_CFLAGS=$pkg_cv_X11_CFLAGS + X11_LIBS=$pkg_cv_X11_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + X11_FOUND=yes +fi +if test "x${X11_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find x11 - \ + Try installing libX11-devel." >&5 +echo "$as_me: error: Could not find x11 - \ + Try installing libX11-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for XINERAMA" >&5 +echo $ECHO_N "checking for XINERAMA... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XINERAMA_CFLAGS"; then + pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5 + ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XINERAMA_LIBS"; then + pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5 + ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xinerama"` + else + XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xinerama"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XINERAMA_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + XINERAMA_FOUND=no +elif test $pkg_failed = untried; then + XINERAMA_FOUND=no +else + XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS + XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + XINERAMA_FOUND=yes + +fi +if test "x${XINERAMA_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find Xinerama - \ + Try installing libXinerama-devel." >&5 +echo "$as_me: error: Could not find Xinerama - \ + Try installing libXinerama-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for LIBPNG" >&5 +echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBPNG_CFLAGS"; then + pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5 + ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$LIBPNG_LIBS"; then + pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5 + ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"` + else + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBPNG_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + LIBPNG_FOUND=no +elif test $pkg_failed = untried; then + LIBPNG_FOUND=no +else + LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS + LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + LIBPNG_FOUND=yes + +fi +if test "x${LIBPNG_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find libpng - \ + Try installing libpng-devel." >&5 +echo "$as_me: error: Could not find libpng - \ + Try installing libpng-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for XTST" >&5 +echo $ECHO_N "checking for XTST... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XTST_CFLAGS"; then + pkg_cv_XTST_CFLAGS="$XTST_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5 + ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XTST_LIBS"; then + pkg_cv_XTST_LIBS="$XTST_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5 + ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xtst"` + else + XTST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XTST_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + XTST_FOUND=no +elif test $pkg_failed = untried; then + XTST_FOUND=no +else + XTST_CFLAGS=$pkg_cv_XTST_CFLAGS + XTST_LIBS=$pkg_cv_XTST_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + XTST_FOUND=yes +fi +if test "x${XTST_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find Xtst - \ + Try installing libXtst-devel." >&5 +echo "$as_me: error: Could not find Xtst - \ + Try installing libXtst-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for FREETYPE2" >&5 +echo $ECHO_N "checking for FREETYPE2... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$FREETYPE2_CFLAGS"; then + pkg_cv_FREETYPE2_CFLAGS="$FREETYPE2_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 + ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$FREETYPE2_LIBS"; then + pkg_cv_FREETYPE2_LIBS="$FREETYPE2_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 + ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FREETYPE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2"` + else + FREETYPE2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$FREETYPE2_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + FREETYPE2_FOUND=no +elif test $pkg_failed = untried; then + FREETYPE2_FOUND=no +else + FREETYPE2_CFLAGS=$pkg_cv_FREETYPE2_CFLAGS + FREETYPE2_LIBS=$pkg_cv_FREETYPE2_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + FREETYPE2_FOUND=yes + +fi +if test "x${FREETYPE2_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find freetype2 - \ + Try installing freetype2-devel." >&5 +echo "$as_me: error: Could not find freetype2 - \ + Try installing freetype2-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for ALSA" >&5 +echo $ECHO_N "checking for ALSA... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$ALSA_CFLAGS"; then + pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5 + ($PKG_CONFIG --exists --print-errors "alsa") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$ALSA_LIBS"; then + pkg_cv_ALSA_LIBS="$ALSA_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5 + ($PKG_CONFIG --exists --print-errors "alsa") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa"` + else + ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ALSA_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + ALSA_FOUND=no +elif test $pkg_failed = untried; then + ALSA_FOUND=no +else + ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS + ALSA_LIBS=$pkg_cv_ALSA_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + ALSA_FOUND=yes +fi +if test "x${ALSA_FOUND}" = xno +then + { { echo "$as_me:$LINENO: error: Could not find alsa - \ + Try installing alsa-lib-devel." >&5 +echo "$as_me: error: Could not find alsa - \ + Try installing alsa-lib-devel." >&2;} + { (exit 1); exit 1; }; } +fi + + + +if test "$ENABLE_PLUGIN" = "yes"; then + +pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA" >&5 echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } @@ -10944,7 +10840,6 @@ XALAN2_JAR!$XALAN2_JAR$ac_delim XALAN2_SERIALIZER_JAR!$XALAN2_SERIALIZER_JAR$ac_delim XERCES2_JAR!$XERCES2_JAR$ac_delim -FREETYPE2_INC_DIR!$FREETYPE2_INC_DIR$ac_delim USE_ALT_OPENJDK_SRC_ZIP_TRUE!$USE_ALT_OPENJDK_SRC_ZIP_TRUE$ac_delim USE_ALT_OPENJDK_SRC_ZIP_FALSE!$USE_ALT_OPENJDK_SRC_ZIP_FALSE$ac_delim ALT_OPENJDK_SRC_ZIP!$ALT_OPENJDK_SRC_ZIP$ac_delim @@ -10961,6 +10856,24 @@ GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim +XPROTO_CFLAGS!$XPROTO_CFLAGS$ac_delim +XPROTO_LIBS!$XPROTO_LIBS$ac_delim +XT_CFLAGS!$XT_CFLAGS$ac_delim +XT_LIBS!$XT_LIBS$ac_delim +XP_CFLAGS!$XP_CFLAGS$ac_delim +XP_LIBS!$XP_LIBS$ac_delim +X11_CFLAGS!$X11_CFLAGS$ac_delim +X11_LIBS!$X11_LIBS$ac_delim +XINERAMA_CFLAGS!$XINERAMA_CFLAGS$ac_delim +XINERAMA_LIBS!$XINERAMA_LIBS$ac_delim +LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim +LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim +XTST_CFLAGS!$XTST_CFLAGS$ac_delim +XTST_LIBS!$XTST_LIBS$ac_delim +FREETYPE2_CFLAGS!$FREETYPE2_CFLAGS$ac_delim +FREETYPE2_LIBS!$FREETYPE2_LIBS$ac_delim +ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim +ALSA_LIBS!$ALSA_LIBS$ac_delim MOZILLA_CFLAGS!$MOZILLA_CFLAGS$ac_delim MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim @@ -10971,7 +10884,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac Thu Feb 07 10:27:32 2008 -0500 +++ b/configure.ac Thu Feb 07 13:19:13 2008 -0500 @@ -123,7 +123,6 @@ AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) fi -FIND_FREETYPE WITH_OPENJDK_SRC_ZIP WITH_OPENJDK_SRC_DIR AC_CHECK_WITH_CACAO @@ -133,14 +132,16 @@ FIND_TOOL([MERCURIAL], [hg]) fi -CHECK_HEADERS - -AC_CHECK_LIB(Xtst, XTestQueryExtension, - , [AC_MSG_ERROR("libXtst not found - try installing libXtst-devel")]) -AC_CHECK_LIB(Xinerama, XineramaQueryExtension, - , [AC_MSG_ERROR("libXinerama not found - try installing libXinerama-devel")]) -AC_CHECK_LIB(png, main, - , [AC_MSG_ERROR("libpng not found - try installing libpng-devel")]) +dnl pkgconfig cannot be used to finid these headers and libraries. +AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] + ,[AC_MSG_ERROR("CUPS headers were not found - + try installing cups-devel.")]) +AC_CHECK_HEADERS([X11/X.h],[] + ,[AC_MSG_ERROR("xorg headers were not found - + try installing xorg-x11-proto-devel.")]) +AC_CHECK_HEADERS([Xm/Xm.h Xm/XmP.h Xm/Display.h],[] + ,[AC_MSG_ERROR("motif headers were not found - + try installing lesstif-devel.")]) AC_CHECK_LIB(jpeg, main, , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")]) AC_CHECK_LIB(gif, main, @@ -148,6 +149,99 @@ AC_CHECK_LIB(z, main, , [AC_MSG_ERROR("zlib not found - try installing zlib-devel")]) +dnl Check for Xproto headers and libraries. +PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) +if test "x${XPROTO_FOUND}" = xno +then + AC_MSG_ERROR([Could not find Xproto headers - \ + Try installing xorg-x11-proto-devel.]) +fi +AC_SUBST(XT_CFLAGS) +AC_SUBST(XT_LIBS) + +dnl Check for libXt headers and libraries. +PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no]) +if test "x${XT_FOUND}" = xno +then + AC_MSG_ERROR([Could not find Xt - \ + Try installing libXt-devel.]) +fi +AC_SUBST(XT_CFLAGS) +AC_SUBST(XT_LIBS) + +dnl Check for libXp headers and libraries. +PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) +if test "x${XP_FOUND}" = xno +then + AC_MSG_ERROR([Could not find Xp - \ + Try installing libXp-devel.]) +fi +AC_SUBST(XP_CFLAGS) +AC_SUBST(XP_LIBS) + +dnl Check for libX11 headers and libraries. +PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) +if test "x${X11_FOUND}" = xno +then + AC_MSG_ERROR([Could not find x11 - \ + Try installing libX11-devel.]) +fi +AC_SUBST(X11_CFLAGS) +AC_SUBST(X11_LIBS) + +dnl Check for libXinerama headers and libraries. +PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] + ,[XINERAMA_FOUND=no]) +if test "x${XINERAMA_FOUND}" = xno +then + AC_MSG_ERROR([Could not find Xinerama - \ + Try installing libXinerama-devel.]) +fi +AC_SUBST(XINERAMA_CFLAGS) +AC_SUBST(XINERAMA_LIBS) + +dnl Check for libpng headers and libraries. +PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] + ,[LIBPNG_FOUND=no]) +if test "x${LIBPNG_FOUND}" = xno +then + AC_MSG_ERROR([Could not find libpng - \ + Try installing libpng-devel.]) +fi +AC_SUBST(LIBPNG_CFLAGS) +AC_SUBST(LIBPNG_LIBS) + +dnl Check for libXtst headers and libraries. +PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) +if test "x${XTST_FOUND}" = xno +then + AC_MSG_ERROR([Could not find Xtst - \ + Try installing libXtst-devel.]) +fi +AC_SUBST(XTST_CFLAGS) +AC_SUBST(XTST_LIBS) + +dnl Check for freetype2 headers and libraries. +PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] + ,[FREETYPE2_FOUND=no]) +if test "x${FREETYPE2_FOUND}" = xno +then + AC_MSG_ERROR([Could not find freetype2 - \ + Try installing freetype2-devel.]) +fi +AC_SUBST(FREETYPE2_CFLAGS) +AC_SUBST(FREETYPE2_LIBS) + +dnl Check for alsa headers and libraries. +PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) +if test "x${ALSA_FOUND}" = xno +then + AC_MSG_ERROR([Could not find alsa - \ + Try installing alsa-lib-devel.]) +fi +AC_SUBST(ALSA_CFLAGS) +AC_SUBST(ALSA_LIBS) + dnl Check for plugin support headers and libraries. if test "$ENABLE_PLUGIN" = "yes"; then PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], \