Update of /cvsroot/scim/scim-tables
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12820
Modified Files:
configure.ac Makefile.am
Log Message:
- Added a dutch translation.
- Fix configure.ac to allow you disabling skim support.
- Fix skim/bootstrap to download admin stuff from the kde subversion directly.
Index: configure.ac
===================================================================
RCS file: /cvsroot/scim/scim-tables/configure.ac,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** configure.ac 17 Feb 2008 07:01:36 -0000 1.54
--- configure.ac 23 Feb 2008 16:17:14 -0000 1.55
***************
*** 16,20 ****
# Init gettext
! ALL_LINGUAS="zh_CN zh_TW ja ko de fr it pa"
AM_GNU_GETTEXT
--- 16,20 ----
# Init gettext
! ALL_LINGUAS="zh_CN zh_TW ja ko de fr it pa nl"
AM_GNU_GETTEXT
***************
*** 61,74 ****
# Extra args.
AC_ARG_ENABLE(debug,
! [ --enable-debug Turn on debugging],
! enable_debug=yes,
enable_debug=no)
AC_ARG_ENABLE(skim-support,
! [ --disable-skim-support Enable skim Setup UI],
! skim_support=no,
! skim_support=yes)
! AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$skim_support" = "yes"])
if test "$enable_debug" = "yes"; then
--- 61,72 ----
# Extra args.
AC_ARG_ENABLE(debug,
! [ --enable-debug Turn on debugging], ,
enable_debug=no)
AC_ARG_ENABLE(skim-support,
! [ --enable-skim-support Enable skim Setup UI], ,
! enable_skim_support=yes)
! AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$enable_skim_support" = "yes"])
if test "$enable_debug" = "yes"; then
***************
*** 182,214 ****
tables/additional/IPA-X-SAMPA.txt])
! if test "$skim_support" = "yes"; then
! REQUIRED_SKIM_VERSION=1.2.1
! dnl skim probably has been installed under prefix=$KDEDIR, so add it to search path of pkgconfig
! kde_libsuffix=`kde-config --libsuffix`
! test -z "$KDEDIR" && KDEDIR=`kde-config --prefix`
! AC_SUBST(KDEDIR)
! export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib${kde_libsuffix}/pkgconfig
! PKG_CHECK_MODULES(SKIM, [skim >= $REQUIRED_SKIM_VERSION],
! [HAS_SKIM=yes],
! [HAS_SKIM=no])
else
! HAS_SKIM=no
fi
if test "x$HAS_SKIM" = "xyes"; then
!
! PKG_CHECK_MODULES(SCIM_KDEUTILS,[scim_kdeutils >= $REQUIRED_SKIM_VERSION],
[HAS_KDEUTILS=yes],
[HAS_KDEUTILS=no])
-
if test "x$HAS_KDEUTILS" = "xyes"; then
- SCIM_TABLES_ENABLE_SKIM_SUPPORT=1
AC_CONFIG_SUBDIRS(skim)
else
SCIM_TABLES_ENABLE_SKIM_SUPPORT=0
fi
fi
! AM_CONDITIONAL(SCIM_TABLES_ENABLE_SKIM_SUPPORT, [test "$HAS_KDEUTILS" = "yes"])
AC_SUBST(SCIM_TABLES_ENABLE_SKIM_SUPPORT)
AC_OUTPUT
--- 180,227 ----
tables/additional/IPA-X-SAMPA.txt])
! if test "$enable_skim_support" = "yes"; then
! REQUIRED_SKIM_VERSION=1.2.1
! dnl skim probably has been installed under prefix=$KDEDIR, so add it to search path of pkgconfig
! kde_libsuffix=`kde-config --libsuffix`
! test -z "$KDEDIR" && KDEDIR=`kde-config --prefix`
! AC_SUBST(KDEDIR)
! export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib${kde_libsuffix}/pkgconfig
! PKG_CHECK_MODULES(SKIM, [skim >= $REQUIRED_SKIM_VERSION],
! [HAS_SKIM=yes],
! [HAS_SKIM=no])
else
! HAS_SKIM=no
fi
if test "x$HAS_SKIM" = "xyes"; then
! PKG_CHECK_MODULES(SCIM_KDEUTILS,[scim_kdeutils >= $REQUIRED_SKIM_VERSION],
[HAS_KDEUTILS=yes],
[HAS_KDEUTILS=no])
if test "x$HAS_KDEUTILS" = "xyes"; then
AC_CONFIG_SUBDIRS(skim)
+ SCIM_TABLES_ENABLE_SKIM_SUPPORT=1
+ enable_skim_support=yes
else
SCIM_TABLES_ENABLE_SKIM_SUPPORT=0
+ enable_skim_support=no
fi
+ else
+ SCIM_TABLES_ENABLE_SKIM_SUPPORT=0
+ enable_skim_support=no
fi
! AM_CONDITIONAL(SCIM_TABLES_ENABLE_SKIM_SUPPORT, [test "$SCIM_TABLES_ENABLE_SKIM_SUPPORT" = "1"])
AC_SUBST(SCIM_TABLES_ENABLE_SKIM_SUPPORT)
AC_OUTPUT
+
+ AC_MSG_RESULT([
+ Build options:
+ Version $VERSION
+ Install prefix $prefix
+ Build shared libs $enable_shared
+ Build static libs $enable_static
+ Enable debug $enable_debug
+
+ Module options:
+ Enable skim support $enable_skim_support
+ ])
\ No newline at end of file
Index: Makefile.am
===================================================================
RCS file: /cvsroot/scim/scim-tables/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile.am 5 Dec 2005 07:13:12 -0000 1.12
--- Makefile.am 23 Feb 2008 16:17:14 -0000 1.13
***************
*** 28,32 ****
if SCIM_TABLES_ENABLE_SKIM_SUPPORT
! SKIM_SUBDIR=skim
endif
--- 28,32 ----
if SCIM_TABLES_ENABLE_SKIM_SUPPORT
! SKIM_SUBDIR=skim
endif
|
