Yasumichi Akahoshi
yasum****@users*****
2005年 8月 23日 (火) 21:22:40 JST
Index: libcxp/Makefile.in
diff -u libcxp/Makefile.in:1.5 libcxp/Makefile.in:1.6
--- libcxp/Makefile.in:1.5 Wed May 18 00:41:10 2005
+++ libcxp/Makefile.in Tue Aug 23 21:22:39 2005
@@ -168,6 +168,8 @@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SMI_CFLAGS = @SMI_CFLAGS@
+SMI_LIBS = @SMI_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
Index: libcxp/config.h.in
diff -u libcxp/config.h.in:1.3 libcxp/config.h.in:1.4
--- libcxp/config.h.in:1.3 Thu Mar 31 01:04:44 2005
+++ libcxp/config.h.in Tue Aug 23 21:22:39 2005
@@ -54,6 +54,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define directory of mime description. */
+#undef MIME_DIR
+
/* Name of package */
#undef PACKAGE
Index: libcxp/configure
diff -u libcxp/configure:1.16 libcxp/configure:1.17
--- libcxp/configure:1.16 Thu Aug 11 00:05:11 2005
+++ libcxp/configure Tue Aug 23 21:22:39 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 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 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_files=''
# Initialize some variables set by options.
@@ -20185,6 +20185,109 @@
+
+ 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
+ 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
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+
+ if test "$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
+
+ 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"`
+
+ 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
+
+MIME_DIR=`pkg-config --variable=prefix shared-mime-info`/share/mime
+
+cat >>confdefs.h <<_ACEOF
+#define MIME_DIR "$MIME_DIR"
+_ACEOF
+
+
# Checks for typedefs, structures, and compiler characteristics.
echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
@@ -22876,6 +22979,8 @@
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.14 libcxp/configure.ac:1.15
--- libcxp/configure.ac:1.14 Wed May 18 00:41:10 2005
+++ libcxp/configure.ac Tue Aug 23 21:22:39 2005
@@ -25,6 +25,10 @@
AC_SUBST(GCONF_LIBS)
AC_SUBST(GCONF_CFLAGS)
+PKG_CHECK_MODULES(SMI, shared-mime-info,,exit)
+MIME_DIR=`pkg-config --variable=prefix shared-mime-info`/share/mime
+AC_DEFINE_UNQUOTED(MIME_DIR, "$MIME_DIR", Define directory of mime description.)
+
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST