Yasumichi Akahoshi
yasum****@users*****
2005年 1月 22日 (土) 01:29:20 JST
Index: cxplorer/.tm_project.cache Index: cxplorer/Makefile.am diff -u cxplorer/Makefile.am:1.9 cxplorer/Makefile.am:1.10 --- cxplorer/Makefile.am:1.9 Tue Jan 4 23:45:31 2005 +++ cxplorer/Makefile.am Sat Jan 22 01:29:19 2005 @@ -18,6 +18,8 @@ EXTRA_DIST = $(cxplorerdoc_DATA) + + # Copy all the spec files. Of cource, only one is actually used. dist-hook: for specfile in *.spec; do \ Index: cxplorer/Makefile.in diff -u cxplorer/Makefile.in:1.5 cxplorer/Makefile.in:1.6 --- cxplorer/Makefile.in:1.5 Sat Nov 6 11:44:57 2004 +++ cxplorer/Makefile.in Sat Jan 22 01:29:19 2005 @@ -65,6 +65,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ +CXP_CFLAGS = @CXP_CFLAGS@ +CXP_LIBS = @CXP_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ @@ -79,8 +81,6 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ Index: cxplorer/configure diff -u cxplorer/configure:1.12 cxplorer/configure:1.13 --- cxplorer/configure:1.12 Fri Dec 17 23:32:12 2004 +++ cxplorer/configure Sat Jan 22 01:29:19 2005 @@ -463,7 +463,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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT 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 STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG GTK_CFLAGS GTK_LIBS GETTEXT_PACKAGE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIB INTL LTLIBINTL POSUB NO_PREFIX_PACKAGE_DATA_DIR PACKAGE_DATA_DIR NO_PREFIX_PACKAGE_DOC_DIR PACKAGE_DOC_DIR NO_PREFIX_PACKAGE_PIXMAPS_DIR PACKAGE_PIXMAPS_DIR NO_PREFIX_PACKAGE_HELP_DIR PACKAGE_HELP_DIR NO_PREFIX_PACKAGE_MENU_DIR PACKAGE_MENU_DIR 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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT 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 STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG CXP_CFLAGS CXP_LIBS GETTEXT_PACKAGE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIB INTL LTLIBINTL POSUB NO_PREFIX_PACKAGE_DATA_DIR PACKAGE_DATA_DIR NO_PREFIX_PACKAGE_DOC_DIR PACKAGE_DOC_DIR NO_PREFIX_PACKAGE_PIXMAPS_DIR PACKAGE_PIXMAPS_DIR NO_PREFIX_PACKAGE_HELP_DIR PACKAGE_HELP_DIR NO_PREFIX_PACKAGE_MENU_DIR PACKAGE_MENU_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1695,7 +1695,7 @@ PACKAGE=cxplorer -VERSION=1.9.20041217 +VERSION=1.9.20050121 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -19837,31 +19837,31 @@ 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 + echo "$as_me:$LINENO: checking for libcxp" >&5 +echo $ECHO_N "checking for libcxp... $ECHO_C" >&6 - if $PKG_CONFIG --exists "gtk+-2.0 gdk-2.0" ; then + if $PKG_CONFIG --exists "libcxp" ; 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 + echo "$as_me:$LINENO: checking CXP_CFLAGS" >&5 +echo $ECHO_N "checking CXP_CFLAGS... $ECHO_C" >&6 + CXP_CFLAGS=`$PKG_CONFIG --cflags "libcxp"` + echo "$as_me:$LINENO: result: $CXP_CFLAGS" >&5 +echo "${ECHO_T}$CXP_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking CXP_LIBS" >&5 +echo $ECHO_N "checking CXP_LIBS... $ECHO_C" >&6 + CXP_LIBS=`$PKG_CONFIG --libs "libcxp"` + echo "$as_me:$LINENO: result: $CXP_LIBS" >&5 +echo "${ECHO_T}$CXP_LIBS" >&6 else - GTK_CFLAGS="" - GTK_LIBS="" + CXP_CFLAGS="" + CXP_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"` + CXP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcxp"` fi @@ -24670,8 +24670,8 @@ s, @ ac_ct_F77@,$ac_ct_F77,;t t s, @ LIBTOOL@,$LIBTOOL,;t t s, @ PKG_CONFIG@,$PKG_CONFIG,;t t -s, @ GTK_CFLAGS@,$GTK_CFLAGS,;t t -s, @ GTK_LIBS@,$GTK_LIBS,;t t +s, @ CXP_CFLAGS@,$CXP_CFLAGS,;t t +s, @ CXP_LIBS@,$CXP_LIBS,;t t s, @ GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t s, @ MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s, @ USE_NLS@,$USE_NLS,;t t @@ -25418,4 +25418,3 @@ $ac_cs_success || { (exit 1); exit 1; } fi - Index: cxplorer/configure.in diff -u cxplorer/configure.in:1.16 cxplorer/configure.in:1.17 --- cxplorer/configure.in:1.16 Tue Jan 4 23:45:31 2005 +++ cxplorer/configure.in Sat Jan 22 01:29:19 2005 @@ -4,7 +4,7 @@ dnl Please disable it in the Anjuta project configuration AC_INIT(configure.in) -AM_INIT_AUTOMAKE(cxplorer, 1.9.20041217) +AM_INIT_AUTOMAKE(cxplorer, 1.9.20050121) AM_CONFIG_HEADER(config.h) AC_ISC_POSIX @@ -14,15 +14,27 @@ AM_PROG_CC_STDC AC_HEADER_STDC AM_PROG_LIBTOOL -PKG_CHECK_MODULES(GTK, gtk+-2.0 gdk-2.0,,exit) -AC_SUBST(GTK_LIBS) -AC_SUBST(GTK_CFLAGS) +PKG_CHECK_MODULES(CXP, libcxp,,exit) +AC_SUBST(CXP_LIBS) +AC_SUBST(CXP_CFLAGS) dnl Checks for programs. + + dnl Checks for libraries. + + dnl Checks for header files. + + dnl Checks for typedefs, structures, and compiler characteristics. + + dnl Checks for library functions. + + dnl Checks for Additional stuffs. + + GETTEXT_PACKAGE=cxplorer AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) @@ -104,4 +116,3 @@ src/Makefile pixmaps/Makefile ]) - Index: cxplorer/cxplorer.prj diff -u cxplorer/cxplorer.prj:1.16 cxplorer/cxplorer.prj:1.17 --- cxplorer/cxplorer.prj:1.16 Wed Jan 5 01:33:15 2005 +++ cxplorer/cxplorer.prj Sat Jan 22 01:29:19 2005 @@ -28,7 +28,7 @@ project.name=cxplorer project.type=GTK 2.0 project.target.type=EXECUTABLE -project.version=1.9.20041217 +project.version=1.9.20050121 project.author=Yasumichi Akahoshi project.source.target=cxplorer project.has.gettext=1 @@ -39,7 +39,7 @@ project.config.extra.modules.before= project.config.extra.modules.after= project.config.blocked=0 -project.config.disable.overwriting=0 0 0 0 0 0 0 0 1 +project.config.disable.overwriting=1 1 1 0 0 0 0 0 1 project.menu.entry=cxplorer Version 0.1 project.menu.group=Applications