Yasumichi Akahoshi
yasum****@users*****
2005年 9月 2日 (金) 22:19:11 JST
Index: libcxp/config.h.in
diff -u libcxp/config.h.in:1.4 libcxp/config.h.in:1.5
--- libcxp/config.h.in:1.4 Tue Aug 23 21:22:39 2005
+++ libcxp/config.h.in Fri Sep 2 22:19:10 2005
@@ -54,9 +54,6 @@
/* 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
@@ -87,5 +84,8 @@
/* Version number of package */
#undef VERSION
+/* Define directory of mime description. */
+#undef XDG_DATA_DIR
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Index: libcxp/configure
diff -u libcxp/configure:1.19 libcxp/configure:1.20
--- libcxp/configure:1.19 Fri Sep 2 00:42:24 2005
+++ libcxp/configure Fri Sep 2 22:19:10 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 GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE 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_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 GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE 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 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.
@@ -950,14 +950,6 @@
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}
@@ -974,6 +966,14 @@
ac_env_GCONF_LIBS_value=$GCONF_LIBS
ac_cv_env_GCONF_LIBS_set=${GCONF_LIBS+set}
ac_cv_env_GCONF_LIBS_value=$GCONF_LIBS
+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
#
# Report the --help message.
@@ -1093,13 +1093,13 @@
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
+ SMI_CFLAGS C compiler flags for SMI, overriding pkg-config
+ SMI_LIBS linker flags for SMI, 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.
@@ -20190,68 +20190,6 @@
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
-
- exit
-elif test $pkg_failed = untried; then
- exit
-else
- SMI_CFLAGS=$pkg_cv_SMI_CFLAGS
- SMI_LIBS=$pkg_cv_SMI_LIBS
- :
-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
@@ -20442,10 +20380,10 @@
SMI_LIBS=$pkg_cv_SMI_LIBS
:
fi
-MIME_DIR=`pkg-config --variable=prefix shared-mime-info`/share/mime
+XDG_DATA_DIR=`pkg-config --variable=prefix shared-mime-info`/share
cat >>confdefs.h <<_ACEOF
-#define MIME_DIR "$MIME_DIR"
+#define XDG_DATA_DIR "$XDG_DATA_DIR"
_ACEOF
@@ -23148,12 +23086,12 @@
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.17 libcxp/configure.ac:1.18
--- libcxp/configure.ac:1.17 Fri Sep 2 00:42:24 2005
+++ libcxp/configure.ac Fri Sep 2 22:19:10 2005
@@ -18,7 +18,6 @@
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)
@@ -28,8 +27,8 @@
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.)
+XDG_DATA_DIR=`pkg-config --variable=prefix shared-mime-info`/share
+AC_DEFINE_UNQUOTED(XDG_DATA_DIR, "$XDG_DATA_DIR", Define directory of mime description.)
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
Index: libcxp/libcxp.schemas
diff -u libcxp/libcxp.schemas:1.2 libcxp/libcxp.schemas:1.3
--- libcxp/libcxp.schemas:1.2 Fri Sep 2 00:52:27 2005
+++ libcxp/libcxp.schemas Fri Sep 2 22:19:10 2005
@@ -126,7 +126,7 @@
<applyto>/apps/cxp/mime-types/application/x-perl/preview</applyto>
<owner>libcxp</owner>
<type>string</type>
- <default>perl -c</default>
+ <default>head --lines 20</default>
<locale name="C">
<short>Command to preview file</short>
<long>Command to preview file</long>