Yasumichi Akahoshi
yasum****@users*****
2005年 5月 18日 (水) 00:42:06 JST
Index: cxplorer/Makefile.in
diff -u cxplorer/Makefile.in:1.15 cxplorer/Makefile.in:1.16
--- cxplorer/Makefile.in:1.15 Sun May 15 01:23:04 2005
+++ cxplorer/Makefile.in Wed May 18 00:42:05 2005
@@ -108,8 +108,6 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
Index: cxplorer/configure
diff -u cxplorer/configure:1.34 cxplorer/configure:1.35
--- cxplorer/configure:1.34 Tue May 17 21:54:10 2005
+++ cxplorer/configure Wed May 18 00:42:05 2005
@@ -311,7 +311,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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 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 PKG_CONFIG CXP_CFLAGS CXP_LIBS GCONF_CFLAGS GCONF_LIBS MAGIC_LIB CPP EGREP LIBOBJS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 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 PKG_CONFIG CXP_CFLAGS CXP_LIBS MAGIC_LIB CPP EGREP LIBOBJS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3190,105 +3190,6 @@
- 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 gconf-2.0" >&5
-echo $ECHO_N "checking for gconf-2.0... $ECHO_C" >&6
-
- if $PKG_CONFIG --exists "gconf-2.0" ; 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"`
-
- 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
-
-
-
-
-
echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
echo $ECHO_N "checking for magic_load in -lmagic... $ECHO_C" >&6
if test "${ac_cv_lib_magic_magic_load+set}" = set; then
@@ -6743,8 +6644,6 @@
s, ＠ PKG_CONFIG@,$PKG_CONFIG,;t t
s, ＠ CXP_CFLAGS@,$CXP_CFLAGS,;t t
s, ＠ CXP_LIBS@,$CXP_LIBS,;t t
-s, ＠ GCONF_CFLAGS@,$GCONF_CFLAGS,;t t
-s, ＠ GCONF_LIBS@,$GCONF_LIBS,;t t
s, ＠ MAGIC_LIB@,$MAGIC_LIB,;t t
s, ＠ CPP@,$CPP,;t t
s, ＠ EGREP@,$EGREP,;t t
Index: cxplorer/configure.ac
diff -u cxplorer/configure.ac:1.3 cxplorer/configure.ac:1.4
--- cxplorer/configure.ac:1.3 Tue May 17 21:54:10 2005
+++ cxplorer/configure.ac Wed May 18 00:42:05 2005
@@ -18,10 +18,6 @@
AC_SUBST(CXP_LIBS)
AC_SUBST(CXP_CFLAGS)
-PKG_CHECK_MODULES(GCONF, gconf-2.0,,exit)
-AC_SUBST(GCONF_LIBS)
-AC_SUBST(GCONF_CFLAGS)
-
AC_CHECK_LIB(magic, magic_load, MAGIC_LIB='-lmagic', exit)
AC_SUBST(MAGIC_LIB)
Index: cxplorer/cxplorer-ui.xml
diff -u cxplorer/cxplorer-ui.xml:1.8 cxplorer/cxplorer-ui.xml:1.9
--- cxplorer/cxplorer-ui.xml:1.8 Wed Apr 27 22:17:11 2005
+++ cxplorer/cxplorer-ui.xml Wed May 18 00:42:05 2005
@@ -30,6 +30,7 @@
</menu>
<menu name="BookmarkMenu" action="BookmarkAction">
<menuitem action="BookmarkAddAction" />
+ <menuitem action="BookmarkEditAction" />
<separator />
<menuitem action="UpAction" />
<menuitem action="HomeAct" />