Changeset 12922


Ignore:
Timestamp:
2006-09-28T17:37:33+12:00 (18 years ago)
Author:
kjdon
Message:

added --disable-accentfold option to main configure, which is used to set ENABLE_ACCENTFOLD. compilation of unac dependent on this, and itss used by src/mgpp/text/makefile to include accentfoldign support or not

Location:
trunk/gsdl
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/configure

    r12492 r12922  
    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 USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ 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 MICO_VER 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 USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ 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 MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
    314314ac_subst_files=''
    315315
    … …  
    858858  --enable-z3950          Enable Z39.50 client support
    859859  --disable-yaz          Disable YAZ compilation
     860  --disable-accentfold          Disable Accent Folding for MGPP
    860861
    861862Optional Packages:
    … …  
    14121413fi;
    14131414
     1415# Check whether --enable-accentfold or --disable-accentfold was given.
     1416if test "${enable_accentfold+set}" = set; then
     1417  enableval="$enable_accentfold"
     1418  ENABLE_ACCENTFOLD=0
     1419else
     1420  ENABLE_ACCENTFOLD=1
     1421fi;
     1422cat >>confdefs.h <<\_ACEOF
     1423#define ENABLE_ACCENTFOLD $ENABLE_ACCENTFOLD
     1424_ACEOF
     1425
     1426
     1427
    14141428LDFLAGS=
    14151429if test -z "$CFLAGS"; then
    … …  
    46484662ac_cv_lib_crypt=ac_cv_lib_crypt_main
    46494663
    4650 
     4664if test $ENABLE_ACCENTFOLD = 1; then
     4665
     4666echo "$as_me:$LINENO: checking for main in -lICONV" >&5
     4667echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6
     4668if test "${ac_cv_lib_ICONV_main+set}" = set; then
     4669  echo $ECHO_N "(cached) $ECHO_C" >&6
     4670else
     4671  ac_check_lib_save_LIBS=$LIBS
     4672LIBS="-lICONV  $LIBS"
     4673cat >conftest.$ac_ext <<_ACEOF
     4674/* confdefs.h.  */
     4675_ACEOF
     4676cat confdefs.h >>conftest.$ac_ext
     4677cat >>conftest.$ac_ext <<_ACEOF
     4678/* end confdefs.h.  */
     4679
     4680
     4681int
     4682main ()
     4683{
     4684main ();
     4685  ;
     4686  return 0;
     4687}
     4688_ACEOF
     4689rm -f conftest.$ac_objext conftest$ac_exeext
     4690if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     4691  (eval $ac_link) 2>conftest.er1
     4692  ac_status=$?
     4693  grep -v '^ *+' conftest.er1 >conftest.err
     4694  rm -f conftest.er1
     4695  cat conftest.err >&5
     4696  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4697  (exit $ac_status); } &&
     4698     { ac_try='test -z "$ac_c_werror_flag"
     4699             || test ! -s conftest.err'
     4700  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4701  (eval $ac_try) 2>&5
     4702  ac_status=$?
     4703  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4704  (exit $ac_status); }; } &&
     4705     { ac_try='test -s conftest$ac_exeext'
     4706  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4707  (eval $ac_try) 2>&5
     4708  ac_status=$?
     4709  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4710  (exit $ac_status); }; }; then
     4711  ac_cv_lib_ICONV_main=yes
     4712else
     4713  echo "$as_me: failed program was:" >&5
     4714sed 's/^/| /' conftest.$ac_ext >&5
     4715
     4716ac_cv_lib_ICONV_main=no
     4717fi
     4718rm -f conftest.err conftest.$ac_objext \
     4719      conftest$ac_exeext conftest.$ac_ext
     4720LIBS=$ac_check_lib_save_LIBS
     4721fi
     4722echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5
     4723echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6
     4724if test $ac_cv_lib_ICONV_main = yes; then
     4725  cat >>confdefs.h <<_ACEOF
     4726#define HAVE_LIBICONV 1
     4727_ACEOF
     4728
     4729  LIBS="-lICONV $LIBS"
     4730
     4731fi
     4732ac_cv_lib_ICONV=ac_cv_lib_ICONV_main
     4733
     4734fi
    46514735
    46524736
    … …  
    79548038s,@USE_Z3950@,$USE_Z3950,;t t
    79558039s,@USE_YAZ@,$USE_YAZ,;t t
     8040s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
    79568041s,@CFLAGS@,$CFLAGS,;t t
    79578042s,@CC@,$CC,;t t

  • trunk/gsdl/configure.in

    r12492 r12922  
    6363dnl
    6464AC_ARG_WITH(gdbm, [  --with-gdbm=dir         Use local gdbm library and headers], gdbmdir=$withval)
     65
     66dnl
     67dnl disable compilation of accent folding stuff for mgpp (and one day mg)
     68dnl
     69AC_ARG_ENABLE(accentfold, [  --disable-accentfold          Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
     70AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     71AC_SUBST(ENABLE_ACCENTFOLD)
    6572
    6673dnl Checks for programs.
    … …  
    148155dnl check for -lcrypt:
    149156AC_HAVE_LIBRARY(crypt)
    150 
     157if test $ENABLE_ACCENTFOLD = 1; then
     158AC_HAVE_LIBRARY(ICONV)
     159fi
    151160
    152161dnl Checks for header files.

  • trunk/gsdl/packages/Makefile.in

    r12519 r12922  
    3131USE_Z3950=@USE_Z3950@
    3232USE_YAZ=@USE_YAZ@
     33
    3334ifeq ($(USE_Z3950), 1)
    3435# make sure USE_YAZ is set
    … …  
    4647endif
    4748
     49
    4850USE_CORBA=@USE_CORBA@
    4951MICO_DIR=@MICO_DIR@
    … …  
    5860endif
    5961
     62ENABLE_ACCENTFOLD=@ENABLE_ACCENTFOLD@
     63ifeq ($(ENABLE_ACCENTFOLD), 1)
     64UNAC=unac
     65else
     66UNAC=
     67endif
     68
    6069PACKAGEDIRS =   wv/wv-gs rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
    6170        wget/wget-1.9 expat/ cpan/XML-Parser-2.34 \
    62         $(YAZ) $(D2M) $(CORBA) \
     71        $(YAZ) $(D2M) $(CORBA) $(UNAC) \
    6372        xlhtml/xlhtml-0.4.9.0 isis-gdl
    6473

  • trunk/gsdl/packages/configure

    r12519 r12922  
    2323# z3950 server disabled by default, switch it on with --enable-z3950
    2424USE_Z3950=false
     25# accentfolding enabled by default - switch it off with --disable-accentfold
     26ENABLE_ACCENTFOLD=true
    2527# parse any arguments given from toplevel configure
    2628while test $# -ne 0; do
    … …  
    5557        MICO_DIR=$1
    5658        ;;       
     59    --disable-accentfold)
     60        ENABLE_ACCENTFOLD=false
     61        ;;
    5762    --prefix=*)
    5863        prefix=`echo $1 | sed s/--prefix=//`
    … …  
    250255./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS
    251256
    252 # configure cgicc
    253 #echo ""
    254 #echo "Configuring cgicc"
    255 #echo ""
    256 #cd "$PACKAGES/cgicc"
    257 #gzip -dc cgicc-3.1.5.tar.gz | tar -xf -
    258 #cd "$PACKAGES/cgicc/cgicc-3.1.5" && \
    259 #./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/cgicc --bindir="$bindir" $HOSTTARGETFLAGS
    260 
     257# configure unac program
     258echo ""
     259echo "Configuring unac"
     260echo ""
     261if test x$ENABLE_ACCENTFOLD = xtrue ;   
     262then
     263  echo "Accent folding support enabled, configuring unac library."
     264  echo "add --disable-accentfold to the configure command to disable this"
     265
     266  cd "$PACKAGES/unac"
     267  ./configure $CACHE_FILE $HOSTTARGETFLAGS
     268else
     269  echo "Accent folding support disabled."
     270  echo ""
     271fi

  • trunk/gsdl/src/mgpp/text/Makefile.in

    r12915 r12922  
    2525VERSION = @VERSION@
    2626
    27 ENABLE_ACCENTFOLD = 1
     27ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
    2828ifeq ($(ENABLE_ACCENTFOLD), 1)
    2929AFLIBS = ../../../packages/unac/libunac.a
Note: See TracChangeset for help on using the changeset viewer.