Changeset 13482


Ignore:
Timestamp:
2006-12-11T11:39:06+13:00 (17 years ago)
Author:
shaoqun
Message:

added the supports for accentfolding

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/gs2build-extra/configure

    r10864 r13482  
    311311
    312312ac_subdirs_all="$ac_subdirs_all packages"
    313 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 PACKAGE VERSION CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
     313ac_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 PACKAGE VERSION ENABLE_ACCENTFOLD CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
    314314ac_subst_files=''
    315315
    … …  
    851851
    852852  cat <<\_ACEOF
     853
     854Optional Features:
     855  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
     856  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     857  --disable-accentfold          Disable Accent Folding for MGPP
    853858
    854859Optional Packages:
    … …  
    13321337fi;
    13331338
     1339
     1340# Check whether --enable-accentfold or --disable-accentfold was given.
     1341if test "${enable_accentfold+set}" = set; then
     1342  enableval="$enable_accentfold"
     1343  ENABLE_ACCENTFOLD=0
     1344else
     1345  ENABLE_ACCENTFOLD=1
     1346fi;
     1347cat >>confdefs.h <<\_ACEOF
     1348#define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD
     1349_ACEOF
     1350
     1351
     1352
     1353
    13341354LDFLAGS=
    13351355if test -z "$CFLAGS"; then
    … …  
    45364556ac_cv_lib_crypt=ac_cv_lib_crypt_main
    45374557
     4558if test $ENABLE_ACCENTFOLD = 1; then
     4559
     4560echo "$as_me:$LINENO: checking for main in -lICONV" >&5
     4561echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6
     4562if test "${ac_cv_lib_ICONV_main+set}" = set; then
     4563  echo $ECHO_N "(cached) $ECHO_C" >&6
     4564else
     4565  ac_check_lib_save_LIBS=$LIBS
     4566LIBS="-lICONV  $LIBS"
     4567cat >conftest.$ac_ext <<_ACEOF
     4568/* confdefs.h.  */
     4569_ACEOF
     4570cat confdefs.h >>conftest.$ac_ext
     4571cat >>conftest.$ac_ext <<_ACEOF
     4572/* end confdefs.h.  */
     4573
     4574
     4575int
     4576main ()
     4577{
     4578main ();
     4579  ;
     4580  return 0;
     4581}
     4582_ACEOF
     4583rm -f conftest.$ac_objext conftest$ac_exeext
     4584if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     4585  (eval $ac_link) 2>conftest.er1
     4586  ac_status=$?
     4587  grep -v '^ *+' conftest.er1 >conftest.err
     4588  rm -f conftest.er1
     4589  cat conftest.err >&5
     4590  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4591  (exit $ac_status); } &&
     4592     { ac_try='test -z "$ac_c_werror_flag"
     4593             || test ! -s conftest.err'
     4594  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4595  (eval $ac_try) 2>&5
     4596  ac_status=$?
     4597  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4598  (exit $ac_status); }; } &&
     4599     { ac_try='test -s conftest$ac_exeext'
     4600  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4601  (eval $ac_try) 2>&5
     4602  ac_status=$?
     4603  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4604  (exit $ac_status); }; }; then
     4605  ac_cv_lib_ICONV_main=yes
     4606else
     4607  echo "$as_me: failed program was:" >&5
     4608sed 's/^/| /' conftest.$ac_ext >&5
     4609
     4610ac_cv_lib_ICONV_main=no
     4611fi
     4612rm -f conftest.err conftest.$ac_objext \
     4613      conftest$ac_exeext conftest.$ac_ext
     4614LIBS=$ac_check_lib_save_LIBS
     4615fi
     4616echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5
     4617echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6
     4618if test $ac_cv_lib_ICONV_main = yes; then
     4619  cat >>confdefs.h <<_ACEOF
     4620#define HAVE_LIBICONV 1
     4621_ACEOF
     4622
     4623  LIBS="-lICONV $LIBS"
     4624
     4625fi
     4626ac_cv_lib_ICONV=ac_cv_lib_ICONV_main
     4627
     4628fi
    45384629
    45394630
    … …  
    78327923s,@PACKAGE@,$PACKAGE,;t t
    78337924s,@VERSION@,$VERSION,;t t
     7925s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
    78347926s,@CFLAGS@,$CFLAGS,;t t
    78357927s,@CC@,$CC,;t t

  • trunk/gs2build-extra/configure.in

    r10854 r13482  
    1616dnl
    1717AC_ARG_WITH(gdbm, [  --with-gdbm=dir         Use local gdbm library and headers], gdbmdir=$withval)
     18
     19
     20dnl
     21dnl disable compilation of accent folding stuff for mgpp (and one day mg)
     22dnl
     23AC_ARG_ENABLE(accentfold, [  --disable-accentfold          Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
     24AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     25AC_SUBST(ENABLE_ACCENTFOLD)
     26
    1827
    1928dnl Checks for programs.
    … …  
    7281dnl check for -lcrypt:
    7382AC_HAVE_LIBRARY(crypt)
     83if test $ENABLE_ACCENTFOLD = 1; then
     84AC_HAVE_LIBRARY(ICONV)
     85fi
    7486
    7587

  • trunk/indexers/mgpp/configure

    r10917 r13482  
    310310#endif"
    311311
    312 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 PACKAGE VERSION CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS'
     312ac_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 PACKAGE VERSION ENABLE_ACCENTFOLD CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS'
    313313ac_subst_files=''
    314314
    … …  
    854854  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    855855  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     856  --disable-accentfold          Disable Accent Folding for MGPP
    856857  --enable-override-longlong
    857858                          overide use of long long with GCC
    … …  
    13461347
    13471348
     1349# Check whether --enable-accentfold or --disable-accentfold was given.
     1350if test "${enable_accentfold+set}" = set; then
     1351  enableval="$enable_accentfold"
     1352  ENABLE_ACCENTFOLD=0
     1353else
     1354  ENABLE_ACCENTFOLD=1
     1355fi;
     1356cat >>confdefs.h <<\_ACEOF
     1357#define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD
     1358_ACEOF
     1359
     1360
     1361
    13481362ac_ext=cc
    13491363ac_cpp='$CXXCPP $CPPFLAGS'
    … …  
    45244538
    45254539  LIBS="-lcrypt $LIBS"
     4540
     4541fi
     4542
     4543if test $ENABLE_ACCENTFOLD = 1; then
     4544
     4545echo "$as_me:$LINENO: checking for main in -lICONV" >&5
     4546echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6
     4547if test "${ac_cv_lib_ICONV_main+set}" = set; then
     4548  echo $ECHO_N "(cached) $ECHO_C" >&6
     4549else
     4550  ac_check_lib_save_LIBS=$LIBS
     4551LIBS="-lICONV  $LIBS"
     4552cat >conftest.$ac_ext <<_ACEOF
     4553/* confdefs.h.  */
     4554_ACEOF
     4555cat confdefs.h >>conftest.$ac_ext
     4556cat >>conftest.$ac_ext <<_ACEOF
     4557/* end confdefs.h.  */
     4558
     4559
     4560int
     4561main ()
     4562{
     4563main ();
     4564  ;
     4565  return 0;
     4566}
     4567_ACEOF
     4568rm -f conftest.$ac_objext conftest$ac_exeext
     4569if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     4570  (eval $ac_link) 2>conftest.er1
     4571  ac_status=$?
     4572  grep -v '^ *+' conftest.er1 >conftest.err
     4573  rm -f conftest.er1
     4574  cat conftest.err >&5
     4575  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4576  (exit $ac_status); } &&
     4577     { ac_try='test -z "$ac_c_werror_flag"
     4578             || test ! -s conftest.err'
     4579  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4580  (eval $ac_try) 2>&5
     4581  ac_status=$?
     4582  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4583  (exit $ac_status); }; } &&
     4584     { ac_try='test -s conftest$ac_exeext'
     4585  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4586  (eval $ac_try) 2>&5
     4587  ac_status=$?
     4588  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4589  (exit $ac_status); }; }; then
     4590  ac_cv_lib_ICONV_main=yes
     4591else
     4592  echo "$as_me: failed program was:" >&5
     4593sed 's/^/| /' conftest.$ac_ext >&5
     4594
     4595ac_cv_lib_ICONV_main=no
     4596fi
     4597rm -f conftest.err conftest.$ac_objext \
     4598      conftest$ac_exeext conftest.$ac_ext
     4599LIBS=$ac_check_lib_save_LIBS
     4600fi
     4601echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5
     4602echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6
     4603if test $ac_cv_lib_ICONV_main = yes; then
     4604  cat >>confdefs.h <<_ACEOF
     4605#define HAVE_LIBICONV 1
     4606_ACEOF
     4607
     4608  LIBS="-lICONV $LIBS"
     4609
     4610fi
     4611ac_cv_lib_ICONV=ac_cv_lib_ICONV_main
    45264612
    45274613fi
    … …  
    81938279s,@PACKAGE@,$PACKAGE,;t t
    81948280s,@VERSION@,$VERSION,;t t
     8281s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
    81958282s,@CXX@,$CXX,;t t
    81968283s,@CXXFLAGS@,$CXXFLAGS,;t t

  • trunk/indexers/mgpp/configure.in

    r10917 r13482  
    1414AC_SUBST(PACKAGE)
    1515AC_SUBST(VERSION)
     16
     17dnl
     18dnl disable compilation of accent folding stuff for mgpp (and one day mg)
     19dnl
     20AC_ARG_ENABLE(accentfold, [  --disable-accentfold          Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
     21AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     22AC_SUBST(ENABLE_ACCENTFOLD)
    1623
    1724dnl Checks for programs.
    … …  
    6067dnl Replace `main' with a function in -lcrypt:
    6168AC_CHECK_LIB(crypt, main)
     69if test $ENABLE_ACCENTFOLD = 1; then
     70AC_HAVE_LIBRARY(ICONV)
     71fi
     72
    6273
    6374dnl Checks for header files.

  • trunk/mgpp/configure

    r10917 r13482  
    310310#endif"
    311311
    312 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 PACKAGE VERSION CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS'
     312ac_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 PACKAGE VERSION ENABLE_ACCENTFOLD CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS'
    313313ac_subst_files=''
    314314
    … …  
    854854  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    855855  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     856  --disable-accentfold          Disable Accent Folding for MGPP
    856857  --enable-override-longlong
    857858                          overide use of long long with GCC
    … …  
    13461347
    13471348
     1349# Check whether --enable-accentfold or --disable-accentfold was given.
     1350if test "${enable_accentfold+set}" = set; then
     1351  enableval="$enable_accentfold"
     1352  ENABLE_ACCENTFOLD=0
     1353else
     1354  ENABLE_ACCENTFOLD=1
     1355fi;
     1356cat >>confdefs.h <<\_ACEOF
     1357#define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD
     1358_ACEOF
     1359
     1360
     1361
    13481362ac_ext=cc
    13491363ac_cpp='$CXXCPP $CPPFLAGS'
    … …  
    45244538
    45254539  LIBS="-lcrypt $LIBS"
     4540
     4541fi
     4542
     4543if test $ENABLE_ACCENTFOLD = 1; then
     4544
     4545echo "$as_me:$LINENO: checking for main in -lICONV" >&5
     4546echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6
     4547if test "${ac_cv_lib_ICONV_main+set}" = set; then
     4548  echo $ECHO_N "(cached) $ECHO_C" >&6
     4549else
     4550  ac_check_lib_save_LIBS=$LIBS
     4551LIBS="-lICONV  $LIBS"
     4552cat >conftest.$ac_ext <<_ACEOF
     4553/* confdefs.h.  */
     4554_ACEOF
     4555cat confdefs.h >>conftest.$ac_ext
     4556cat >>conftest.$ac_ext <<_ACEOF
     4557/* end confdefs.h.  */
     4558
     4559
     4560int
     4561main ()
     4562{
     4563main ();
     4564  ;
     4565  return 0;
     4566}
     4567_ACEOF
     4568rm -f conftest.$ac_objext conftest$ac_exeext
     4569if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     4570  (eval $ac_link) 2>conftest.er1
     4571  ac_status=$?
     4572  grep -v '^ *+' conftest.er1 >conftest.err
     4573  rm -f conftest.er1
     4574  cat conftest.err >&5
     4575  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4576  (exit $ac_status); } &&
     4577     { ac_try='test -z "$ac_c_werror_flag"
     4578             || test ! -s conftest.err'
     4579  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4580  (eval $ac_try) 2>&5
     4581  ac_status=$?
     4582  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4583  (exit $ac_status); }; } &&
     4584     { ac_try='test -s conftest$ac_exeext'
     4585  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4586  (eval $ac_try) 2>&5
     4587  ac_status=$?
     4588  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4589  (exit $ac_status); }; }; then
     4590  ac_cv_lib_ICONV_main=yes
     4591else
     4592  echo "$as_me: failed program was:" >&5
     4593sed 's/^/| /' conftest.$ac_ext >&5
     4594
     4595ac_cv_lib_ICONV_main=no
     4596fi
     4597rm -f conftest.err conftest.$ac_objext \
     4598      conftest$ac_exeext conftest.$ac_ext
     4599LIBS=$ac_check_lib_save_LIBS
     4600fi
     4601echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5
     4602echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6
     4603if test $ac_cv_lib_ICONV_main = yes; then
     4604  cat >>confdefs.h <<_ACEOF
     4605#define HAVE_LIBICONV 1
     4606_ACEOF
     4607
     4608  LIBS="-lICONV $LIBS"
     4609
     4610fi
     4611ac_cv_lib_ICONV=ac_cv_lib_ICONV_main
    45264612
    45274613fi
    … …  
    81938279s,@PACKAGE@,$PACKAGE,;t t
    81948280s,@VERSION@,$VERSION,;t t
     8281s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
    81958282s,@CXX@,$CXX,;t t
    81968283s,@CXXFLAGS@,$CXXFLAGS,;t t

  • trunk/mgpp/configure.in

    r10917 r13482  
    1414AC_SUBST(PACKAGE)
    1515AC_SUBST(VERSION)
     16
     17dnl
     18dnl disable compilation of accent folding stuff for mgpp (and one day mg)
     19dnl
     20AC_ARG_ENABLE(accentfold, [  --disable-accentfold          Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
     21AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     22AC_SUBST(ENABLE_ACCENTFOLD)
    1623
    1724dnl Checks for programs.
    … …  
    6067dnl Replace `main' with a function in -lcrypt:
    6168AC_CHECK_LIB(crypt, main)
     69if test $ENABLE_ACCENTFOLD = 1; then
     70AC_HAVE_LIBRARY(ICONV)
     71fi
     72
    6273
    6374dnl Checks for header files.
Note: See TracChangeset for help on using the changeset viewer.