Yasumichi Akahoshi
yasum****@users*****
2005年 9月 1日 (木) 21:42:20 JST
Index: libcxp/Makefile.in diff -u libcxp/Makefile.in:1.6 libcxp/Makefile.in:1.7 --- libcxp/Makefile.in:1.6 Tue Aug 23 21:22:39 2005 +++ libcxp/Makefile.in Thu Sep 1 21:42:20 2005 @@ -180,6 +180,7 @@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ Index: libcxp/aclocal.m4 diff -u libcxp/aclocal.m4:1.7 libcxp/aclocal.m4:1.8 --- libcxp/aclocal.m4:1.7 Thu Aug 11 00:05:11 2005 +++ libcxp/aclocal.m4 Thu Sep 1 21:42:20 2005 @@ -6803,63 +6803,120 @@ AC_MSG_RESULT([$SED]) ]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright 息 2004 Scott James Remnant <scott****@netsp*****>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then + pkg_cv_[]$1=$ac_cv_env_[]$1[]_value +elif test -n "$PKG_CONFIG"; then + if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then + pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.in +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS], + [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])]) +AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS], + [_PKG_CONFIG([$1][_LIBS], [libs], [$2])]) + +if test $pkg_failed = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details.])], + [$4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES # -*- Autoconf -*- # Copyright (C) 2002, 2003 Free Software Foundation, Inc. Index: libcxp/configure diff -u libcxp/configure:1.17 libcxp/configure:1.18 --- libcxp/configure:1.17 Tue Aug 23 21:22:39 2005 +++ libcxp/configure Thu Sep 1 21:42:20 2005 @@ -465,7 +465,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG GTK_CFLAGS GTK_LIBS GCONF_CFLAGS GCONF_LIBS SMI_CFLAGS SMI_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG SMI_CFLAGS SMI_LIBS GTK_CFLAGS GTK_LIBS GCONF_CFLAGS GCONF_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -946,6 +946,34 @@ ac_env_FFLAGS_value=$FFLAGS ac_cv_env_FFLAGS_set=${FFLAGS+set} ac_cv_env_FFLAGS_value=$FFLAGS +ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_env_PKG_CONFIG_value=$PKG_CONFIG +ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG +ac_env_SMI_CFLAGS_set=${SMI_CFLAGS+set} +ac_env_SMI_CFLAGS_value=$SMI_CFLAGS +ac_cv_env_SMI_CFLAGS_set=${SMI_CFLAGS+set} +ac_cv_env_SMI_CFLAGS_value=$SMI_CFLAGS +ac_env_SMI_LIBS_set=${SMI_LIBS+set} +ac_env_SMI_LIBS_value=$SMI_LIBS +ac_cv_env_SMI_LIBS_set=${SMI_LIBS+set} +ac_cv_env_SMI_LIBS_value=$SMI_LIBS +ac_env_GTK_CFLAGS_set=${GTK_CFLAGS+set} +ac_env_GTK_CFLAGS_value=$GTK_CFLAGS +ac_cv_env_GTK_CFLAGS_set=${GTK_CFLAGS+set} +ac_cv_env_GTK_CFLAGS_value=$GTK_CFLAGS +ac_env_GTK_LIBS_set=${GTK_LIBS+set} +ac_env_GTK_LIBS_value=$GTK_LIBS +ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set} +ac_cv_env_GTK_LIBS_value=$GTK_LIBS +ac_env_GCONF_CFLAGS_set=${GCONF_CFLAGS+set} +ac_env_GCONF_CFLAGS_value=$GCONF_CFLAGS +ac_cv_env_GCONF_CFLAGS_set=${GCONF_CFLAGS+set} +ac_cv_env_GCONF_CFLAGS_value=$GCONF_CFLAGS +ac_env_GCONF_LIBS_set=${GCONF_LIBS+set} +ac_env_GCONF_LIBS_value=$GCONF_LIBS +ac_cv_env_GCONF_LIBS_set=${GCONF_LIBS+set} +ac_cv_env_GCONF_LIBS_value=$GCONF_LIBS # # Report the --help message. @@ -1061,6 +1089,14 @@ CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags + PKG_CONFIG path to pkg-config utility + SMI_CFLAGS C compiler flags for SMI, overriding pkg-config + SMI_LIBS linker flags for SMI, overriding pkg-config + GTK_CFLAGS C compiler flags for GTK, overriding pkg-config + GTK_LIBS linker flags for GTK, overriding pkg-config + GCONF_CFLAGS + C compiler flags for GCONF, overriding pkg-config + GCONF_LIBS linker flags for GCONF, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4303,7 +4339,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4306 "configure"' > conftest.$ac_ext + echo '#line 4342 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5427,7 +5463,7 @@ # Provide some information about the compiler. -echo "$as_me:5430:" \ +echo "$as_me:5466:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6566,11 +6602,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6569: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6605: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6573: \$? = $ac_status" >&5 + echo "$as_me:6609: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6828,11 +6864,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6831: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6867: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6835: \$? = $ac_status" >&5 + echo "$as_me:6871: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6890,11 +6926,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6893: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6929: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6897: \$? = $ac_status" >&5 + echo "$as_me:6933: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8320,7 +8356,7 @@ libsuff= case "$host_cpu" in x86_64*) - echo '#line 8323 "configure"' > conftest.$ac_ext + echo '#line 8359 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9180,7 +9216,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9183 "configure" +#line 9219 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9278,7 +9314,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9281 "configure" +#line 9317 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11526,11 +11562,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11529: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11565: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11533: \$? = $ac_status" >&5 + echo "$as_me:11569: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11588,11 +11624,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11591: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11627: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11595: \$? = $ac_status" >&5 + echo "$as_me:11631: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12148,7 +12184,7 @@ libsuff= case "$host_cpu" in x86_64*) - echo '#line 12151 "configure"' > conftest.$ac_ext + echo '#line 12187 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13008,7 +13044,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13011 "configure" +#line 13047 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13106,7 +13142,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13109 "configure" +#line 13145 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13991,11 +14027,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13994: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14030: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13998: \$? = $ac_status" >&5 + echo "$as_me:14034: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14053,11 +14089,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14056: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14092: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14060: \$? = $ac_status" >&5 + echo "$as_me:14096: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15463,7 +15499,7 @@ libsuff= case "$host_cpu" in x86_64*) - echo '#line 15466 "configure"' > conftest.$ac_ext + echo '#line 15502 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16225,11 +16261,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16228: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16264: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16232: \$? = $ac_status" >&5 + echo "$as_me:16268: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16487,11 +16523,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16490: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16526: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16494: \$? = $ac_status" >&5 + echo "$as_me:16530: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16549,11 +16585,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16552: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16588: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16556: \$? = $ac_status" >&5 + echo "$as_me:16592: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17979,7 +18015,7 @@ libsuff= case "$host_cpu" in x86_64*) - echo '#line 17982 "configure"' > conftest.$ac_ext + echo '#line 18018 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18839,7 +18875,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18842 "configure" +#line 18878 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18937,7 +18973,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18940 "configure" +#line 18976 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19988,11 +20024,11 @@ - succeeded=no - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 +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 @@ -20017,7 +20053,6 @@ done done - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -20031,75 +20066,19 @@ echo "${ECHO_T}no" >&6 fi - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gtk+-2.0 gdk-2.0" >&5 -echo $ECHO_N "checking for gtk+-2.0 gdk-2.0... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "gtk+-2.0 gdk-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gdk-2.0"` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 - GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gdk-2.0"` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 - else - GTK_CFLAGS="" - GTK_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gdk-2.0"` - - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - : - else - exit - fi - - - - - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. +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_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PKG_CONFIG in + case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + 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 @@ -20109,178 +20088,300 @@ 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" + 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 - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 +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 - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gconf-2.0" >&5 -echo $ECHO_N "checking for gconf-2.0... $ECHO_C" >&6 + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi - if $PKG_CONFIG --exists "gconf-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 +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 - succeeded=yes - - echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 - GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0"` - echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -echo "${ECHO_T}$GCONF_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 - GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0"` - echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -echo "${ECHO_T}$GCONF_LIBS" >&6 - else - GCONF_CFLAGS="" - GCONF_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"` + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + PKG_CONFIG="" + fi - fi +fi +pkg_failed=no +echo "$as_me:$LINENO: checking for SMI_CFLAGS" >&5 +echo $ECHO_N "checking for SMI_CFLAGS... $ECHO_C" >&6 +if test "${pkg_cv_SMI_CFLAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_SMI_CFLAGS_set" = "xset"; then + pkg_cv_SMI_CFLAGS=$ac_cv_env_SMI_CFLAGS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"shared-mime-info\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "shared-mime-info" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_SMI_CFLAGS=`$PKG_CONFIG --cflags "shared-mime-info" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_SMI_CFLAGS" >&5 +echo "${ECHO_T}$pkg_cv_SMI_CFLAGS" >&6 +echo "$as_me:$LINENO: checking for SMI_LIBS" >&5 +echo $ECHO_N "checking for SMI_LIBS... $ECHO_C" >&6 +if test "${pkg_cv_SMI_LIBS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_SMI_LIBS_set" = "xset"; then + pkg_cv_SMI_LIBS=$ac_cv_env_SMI_LIBS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"shared-mime-info\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "shared-mime-info" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_SMI_LIBS=`$PKG_CONFIG --libs "shared-mime-info" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_SMI_LIBS" >&5 +echo "${ECHO_T}$pkg_cv_SMI_LIBS" >&6 +if test $pkg_failed = yes; then + SMI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "shared-mime-info"` + # Put the nasty error message in config.log where it belongs + echo "$SMI_PKG_ERRORS" 1>&5 - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi + exit +elif test $pkg_failed = untried; then + exit +else + SMI_CFLAGS=$pkg_cv_SMI_CFLAGS + SMI_LIBS=$pkg_cv_SMI_LIBS + : +fi - if test $succeeded = yes; then - : - else - exit - fi +pkg_failed=no +echo "$as_me:$LINENO: checking for GTK_CFLAGS" >&5 +echo $ECHO_N "checking for GTK_CFLAGS... $ECHO_C" >&6 +if test "${pkg_cv_GTK_CFLAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_GTK_CFLAGS_set" = "xset"; then + pkg_cv_GTK_CFLAGS=$ac_cv_env_GTK_CFLAGS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 gdk-2.0\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "gtk+-2.0 gdk-2.0" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gdk-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_GTK_CFLAGS" >&5 +echo "${ECHO_T}$pkg_cv_GTK_CFLAGS" >&6 +echo "$as_me:$LINENO: checking for GTK_LIBS" >&5 +echo $ECHO_N "checking for GTK_LIBS... $ECHO_C" >&6 +if test "${pkg_cv_GTK_LIBS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_GTK_LIBS_set" = "xset"; then + pkg_cv_GTK_LIBS=$ac_cv_env_GTK_LIBS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 gdk-2.0\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "gtk+-2.0 gdk-2.0" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gdk-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_GTK_LIBS" >&5 +echo "${ECHO_T}$pkg_cv_GTK_LIBS" >&6 +if test $pkg_failed = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gdk-2.0"` + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" 1>&5 + exit +elif test $pkg_failed = untried; then + exit +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + : +fi - succeeded=no - if test -z "$PKG_CONFIG"; then - # 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_PKG_CONFIG+set}" = set; then +pkg_failed=no +echo "$as_me:$LINENO: checking for GCONF_CFLAGS" >&5 +echo $ECHO_N "checking for GCONF_CFLAGS... $ECHO_C" >&6 +if test "${pkg_cv_GCONF_CFLAGS+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 - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac + if test "x$ac_cv_env_GCONF_CFLAGS_set" = "xset"; then + pkg_cv_GCONF_CFLAGS=$ac_cv_env_GCONF_CFLAGS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gconf-2.0\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "gconf-2.0" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried 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 +fi +echo "$as_me:$LINENO: result: $pkg_cv_GCONF_CFLAGS" >&5 +echo "${ECHO_T}$pkg_cv_GCONF_CFLAGS" >&6 +echo "$as_me:$LINENO: checking for GCONF_LIBS" >&5 +echo $ECHO_N "checking for GCONF_LIBS... $ECHO_C" >&6 +if test "${pkg_cv_GCONF_LIBS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + if test "x$ac_cv_env_GCONF_LIBS_set" = "xset"; then + pkg_cv_GCONF_LIBS=$ac_cv_env_GCONF_LIBS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gconf-2.0\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "gconf-2.0" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_GCONF_LIBS" >&5 +echo "${ECHO_T}$pkg_cv_GCONF_LIBS" >&6 - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for shared-mime-info" >&5 -echo $ECHO_N "checking for shared-mime-info... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "shared-mime-info" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then + GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"` + # Put the nasty error message in config.log where it belongs + echo "$GCONF_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: checking SMI_CFLAGS" >&5 -echo $ECHO_N "checking SMI_CFLAGS... $ECHO_C" >&6 - SMI_CFLAGS=`$PKG_CONFIG --cflags "shared-mime-info"` - echo "$as_me:$LINENO: result: $SMI_CFLAGS" >&5 -echo "${ECHO_T}$SMI_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking SMI_LIBS" >&5 -echo $ECHO_N "checking SMI_LIBS... $ECHO_C" >&6 - SMI_LIBS=`$PKG_CONFIG --libs "shared-mime-info"` - echo "$as_me:$LINENO: result: $SMI_LIBS" >&5 -echo "${ECHO_T}$SMI_LIBS" >&6 - else - SMI_CFLAGS="" - SMI_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - SMI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "shared-mime-info"` + exit +elif test $pkg_failed = untried; then + exit +else + GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS + GCONF_LIBS=$pkg_cv_GCONF_LIBS + : +fi - fi - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi +pkg_failed=no +echo "$as_me:$LINENO: checking for SMI_CFLAGS" >&5 +echo $ECHO_N "checking for SMI_CFLAGS... $ECHO_C" >&6 +if test "${pkg_cv_SMI_CFLAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_SMI_CFLAGS_set" = "xset"; then + pkg_cv_SMI_CFLAGS=$ac_cv_env_SMI_CFLAGS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"shared-mime-info\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "shared-mime-info" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_SMI_CFLAGS=`$PKG_CONFIG --cflags "shared-mime-info" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_SMI_CFLAGS" >&5 +echo "${ECHO_T}$pkg_cv_SMI_CFLAGS" >&6 +echo "$as_me:$LINENO: checking for SMI_LIBS" >&5 +echo $ECHO_N "checking for SMI_LIBS... $ECHO_C" >&6 +if test "${pkg_cv_SMI_LIBS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_SMI_LIBS_set" = "xset"; then + pkg_cv_SMI_LIBS=$ac_cv_env_SMI_LIBS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"shared-mime-info\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "shared-mime-info" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_SMI_LIBS=`$PKG_CONFIG --libs "shared-mime-info" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_SMI_LIBS" >&5 +echo "${ECHO_T}$pkg_cv_SMI_LIBS" >&6 - if test $succeeded = yes; then - : - else - exit - fi +if test $pkg_failed = yes; then + SMI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "shared-mime-info"` + # Put the nasty error message in config.log where it belongs + echo "$SMI_PKG_ERRORS" 1>&5 + exit +elif test $pkg_failed = untried; then + exit +else + SMI_CFLAGS=$pkg_cv_SMI_CFLAGS + SMI_LIBS=$pkg_cv_SMI_LIBS + : +fi MIME_DIR=`pkg-config --variable=prefix shared-mime-info`/share/mime cat >>confdefs.h <<_ACEOF @@ -22975,12 +23076,13 @@ s, ＠ ac_ct_F77@,$ac_ct_F77,;t t s, ＠ LIBTOOL@,$LIBTOOL,;t t s, ＠ PKG_CONFIG@,$PKG_CONFIG,;t t +s, ＠ ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t +s, ＠ SMI_CFLAGS@,$SMI_CFLAGS,;t t +s, ＠ SMI_LIBS@,$SMI_LIBS,;t t s, ＠ GTK_CFLAGS@,$GTK_CFLAGS,;t t s, ＠ GTK_LIBS@,$GTK_LIBS,;t t s, ＠ GCONF_CFLAGS@,$GCONF_CFLAGS,;t t s, ＠ GCONF_LIBS@,$GCONF_LIBS,;t t -s, ＠ SMI_CFLAGS@,$SMI_CFLAGS,;t t -s, ＠ SMI_LIBS@,$SMI_LIBS,;t t s, ＠ INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t s, ＠ INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t s, ＠ INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t Index: libcxp/configure.ac diff -u libcxp/configure.ac:1.15 libcxp/configure.ac:1.16 --- libcxp/configure.ac:1.15 Tue Aug 23 21:22:39 2005 +++ libcxp/configure.ac Thu Sep 1 21:42:20 2005 @@ -17,6 +17,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS([stdlib.h string.h]) AC_PROG_LIBTOOL +PKG_CHECK_MODULES(SMI, shared-mime-info,,exit) PKG_CHECK_MODULES(GTK, gtk+-2.0 gdk-2.0,,exit) AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS)
