Changeset 21446


Ignore:
Timestamp:
01/12/10 16:25:17 (11 years ago)
Author:
ak19
Message:

Configure files updated to correctly set all the variables that can be ENABLED/DISABLED.

Location:
main/trunk/greenstone2
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/configure.in

    r21440 r21446  
    3434dnl Set use of corba
    3535dnl
    36 AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=1, USE_CORBA=0)
    37 AC_DEFINE_UNQUOTED(USE_CORBA, $USE_CORBA)
     36AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=$enableval, USE_CORBA=no)
     37if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then
     38  USE_CORBA=1
     39  AC_DEFINE(USE_CORBA,[])
     40else
     41  USE_CORBA=0
     42fi
    3843AC_SUBST(USE_CORBA)
    3944
     
    4550dnl Set use of z39.50
    4651dnl
    47 AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=1, USE_Z3950=0)
    48 if test USE_Z3950 = 1; then
    49 AC_DEFINE(USE_Z3950, $USE_Z3950)
     52AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=$enableval, USE_Z3950=no)
     53if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then
     54  USE_Z3950=1
     55  AC_DEFINE(USE_Z3950,[])
     56else
     57  USE_Z3950=0
     58fi
    5059AC_SUBST(USE_Z3950)
    51 fi
    5260
    5361dnl
    5462dnl Set use of yaz - now compiled by default even when z3950 support not required
    5563dnl
    56 AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
    57 dnl if test USE_YAZ = 1; then
    58 AC_DEFINE(USE_YAZ, $USE_YAZ)
     64AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=$enableval, USE_YAZ=yes)
     65if test $USE_YAZ = "yes" -o $USE_YAZ = "1" ; then
     66  USE_YAZ=1
     67  AC_DEFINE(USE_YAZ,[])
     68else
     69  USE_YAZ=0
     70fi
    5971AC_SUBST(USE_YAZ)
    60 dnl fi
    6172
    6273dnl
    6374dnl disable compilation of accent folding stuff for mgpp (and one day mg)
    6475dnl
    65 AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
    66 AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     76AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=$enableval, ENABLE_ACCENTFOLD=yes)
     77if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     78  ENABLE_ACCENTFOLD=1
     79  AC_DEFINE(ENABLE_ACCENTFOLD,[])
     80else
     81  ENABLE_ACCENTFOLD=0
     82fi
    6783AC_SUBST(ENABLE_ACCENTFOLD)
    6884
     
    7086dnl Set use of SQLite (enabled by default)
    7187dnl
    72 AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=0, USE_SQLITE=1)
    73 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
     88AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=$enableval, USE_SQLITE=yes)
     89if test $USE_SQLITE = "yes" -o $USE_SQLITE = "1" ; then
     90  USE_SQLITE=1
     91  AC_DEFINE(USE_SQLITE,[])
     92else
     93  USE_SQLITE=0
     94fi
    7495AC_SUBST(USE_SQLITE)
    7596
  • main/trunk/greenstone2/common-src/configure.in

    r21440 r21446  
    3636dnl Set use of corba
    3737dnl
    38 AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=1, USE_CORBA=0)
    39 AC_DEFINE_UNQUOTED(USE_CORBA, $USE_CORBA)
     38AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=$enableval, USE_CORBA=no)
     39if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then
     40  USE_CORBA=1
     41  AC_DEFINE(USE_CORBA,[])
     42else
     43  USE_CORBA=0
     44fi
    4045AC_SUBST(USE_CORBA)
    4146
     
    4752dnl Set use of z39.50
    4853dnl
    49 AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=1, USE_Z3950=0)
    50 if test USE_Z3950 = 1; then
    51 AC_DEFINE(USE_Z3950, $USE_Z3950)
     54AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=$enableval, USE_Z3950=no)
     55if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then
     56  USE_Z3950=1
     57  AC_DEFINE(USE_Z3950,[])
     58else
     59  USE_Z3950=0
     60fi
    5261AC_SUBST(USE_Z3950)
    53 fi
    5462
    5563dnl
    5664dnl Set use of yaz - now compiled by default even when z3950 support not required
    5765dnl
    58 AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
    59 dnl if test USE_YAZ = 1; then
    60 AC_DEFINE(USE_YAZ, $USE_YAZ)
     66AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=$enableval, USE_YAZ=yes)
     67if test $USE_YAZ = "yes" -o $USE_YAZ = "1" ; then
     68  USE_YAZ=1
     69  AC_DEFINE(USE_YAZ,[])
     70else
     71  USE_YAZ=0
     72fi
    6173AC_SUBST(USE_YAZ)
    62 dnl fi
    6374
    6475dnl
    6576dnl disable compilation of accent folding stuff for mgpp (and one day mg)
    6677dnl
    67 AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
    68 AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     78AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=$enableval, ENABLE_ACCENTFOLD=yes)
     79if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     80  ENABLE_ACCENTFOLD=1
     81  AC_DEFINE(ENABLE_ACCENTFOLD,[])
     82else
     83  ENABLE_ACCENTFOLD=0
     84fi
    6985AC_SUBST(ENABLE_ACCENTFOLD)
    7086
     
    84100dnl Set use of SQLite (enabled by default)
    85101dnl
    86 AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=0, USE_SQLITE=1)
    87 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
     102AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=$enableval, USE_SQLITE=yes)
     103if test $USE_SQLITE = "yes" -o $USE_SQLITE = "1" ; then
     104  USE_SQLITE=1
     105  AC_DEFINE(USE_SQLITE,[])
     106else
     107  USE_SQLITE=0
     108fi
    88109AC_SUBST(USE_SQLITE)
    89110
  • main/trunk/greenstone2/common-src/indexers/configure.ac

    r21364 r21446  
    66dnl http://www.gnu.org/software/hello/manual/autoconf/Initializing-configure.html
    77AC_INIT()
    8 AC_ARG_ENABLE(accentfolding, [  --disable-accentfolding    Disable Accent Folding support], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
    9 AC_DEFINE_UNQUOTED(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     8AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=$enableval, ENABLE_ACCENTFOLD=yes)
     9if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     10  ENABLE_ACCENTFOLD=1
     11  AC_DEFINE(ENABLE_ACCENTFOLD,[])
     12else
     13  ENABLE_ACCENTFOLD=0
     14fi
    1015AC_SUBST(ENABLE_ACCENTFOLD)
    1116
  • main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

    r20845 r21446  
    4040dnl disable compilation of accent folding stuff for mgpp (and one day mg)
    4141dnl
    42 AC_ARG_ENABLE(accentfold, [  --disable-accentfold          Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
    43 AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     42AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=$enableval, ENABLE_ACCENTFOLD=yes)
     43if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     44  ENABLE_ACCENTFOLD=1
     45  AC_DEFINE(ENABLE_ACCENTFOLD,[])
     46else
     47  ENABLE_ACCENTFOLD=0
     48fi
    4449AC_SUBST(ENABLE_ACCENTFOLD)
    4550
  • main/trunk/greenstone2/configure.in

    r21432 r21446  
    3434dnl Set use of corba
    3535dnl
    36 AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=1, USE_CORBA=0)
    37 AC_DEFINE_UNQUOTED(USE_CORBA, $USE_CORBA)
     36AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=$enableval, USE_CORBA=no)
     37if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then
     38  USE_CORBA=1
     39  AC_DEFINE(USE_CORBA,[])
     40else
     41  USE_CORBA=0
     42fi
    3843AC_SUBST(USE_CORBA)
    3944
     
    4550dnl Set use of z39.50
    4651dnl
    47 AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=1, USE_Z3950=0)
    48 if test USE_Z3950 = 1; then
    49 AC_DEFINE(USE_Z3950, $USE_Z3950)
     52AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=$enableval, USE_Z3950=no)
     53if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then
     54  USE_Z3950=1
     55  AC_DEFINE(USE_Z3950,[])
     56else
     57  USE_Z3950=0
     58fi
    5059AC_SUBST(USE_Z3950)
    51 fi
    5260
    5361dnl
    5462dnl Set use of yaz - now compiled by default even when z3950 support not required
    5563dnl
    56 AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
    57 dnl if test USE_YAZ = 1; then
    58 AC_DEFINE(USE_YAZ, $USE_YAZ)
     64AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=$enableval, USE_YAZ=yes)
     65if test $USE_YAZ = "yes" -o $USE_YAZ = "1" ; then
     66  USE_YAZ=1
     67  AC_DEFINE(USE_YAZ,[])
     68else
     69  USE_YAZ=0
     70fi
    5971AC_SUBST(USE_YAZ)
    60 dnl fi
    6172
    6273dnl
    6374dnl disable compilation of accent folding stuff for mgpp (and one day mg)
    6475dnl
    65 AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
    66 AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     76AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=$enableval, ENABLE_ACCENTFOLD=yes)
     77if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     78  ENABLE_ACCENTFOLD=1
     79  AC_DEFINE(ENABLE_ACCENTFOLD,[])
     80else
     81  ENABLE_ACCENTFOLD=0
     82fi
    6783AC_SUBST(ENABLE_ACCENTFOLD)
    6884
    69 dnl
    70 dnl Set use of JDBM (enabled by default)
    71 dnl
    7285dnl
    7386dnl Set use of JDBM (enabled by default)
     
    8598dnl Set use of SQLite (enabled by default)
    8699dnl
    87 AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=0, USE_SQLITE=1)
    88 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
     100AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=$enableval, USE_SQLITE=yes)
     101if test $USE_SQLITE = "yes" -o $USE_SQLITE = "1" ; then
     102  USE_SQLITE=1
     103  AC_DEFINE(USE_SQLITE,[])
     104else
     105  USE_SQLITE=0
     106fi
    89107AC_SUBST(USE_SQLITE)
    90108
     
    93111dnl
    94112if test -d runtime-src; then
    95    AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=1, USE_APACHE_HTTPD=0)
    96    AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
     113   AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=$enableval, USE_APACHE_HTTPD=no)
     114   if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then
     115     USE_APACHE_HTTPD=1
     116     AC_DEFINE(USE_APACHE_HTTPD,[])
     117   else
     118     USE_APACHE_HTTPD=0
     119   fi
    97120   AC_SUBST(USE_APACHE_HTTPD)
    98121fi
     
    141164if test $ENABLE_LUCENE = "yes" -o $ENABLE_LUCENE = "1" ; then
    142165  ENABLE_LUCENE=1
    143   AC_DEFINE(ENABLE_LUCENE, [])
     166  AC_DEFINE(ENABLE_LUCENE,[])
    144167else
    145168  ENABLE_LUCENE=0
  • main/trunk/greenstone2/runtime-src/configure.in

    r21440 r21446  
    3535dnl Set use of corba
    3636dnl
    37 AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=1, USE_CORBA=0)
    38 AC_DEFINE_UNQUOTED(USE_CORBA, $USE_CORBA)
     37AC_ARG_ENABLE(corba, [  --enable-corba          Enable CORBA support], USE_CORBA=$enableval, USE_CORBA=no)
     38if test $USE_CORBA = "yes" -o $USE_CORBA = "1" ; then
     39  USE_CORBA=1
     40  AC_DEFINE(USE_CORBA,[])
     41else
     42  USE_CORBA=0
     43fi
    3944AC_SUBST(USE_CORBA)
    4045
     
    4651dnl Set use of z39.50
    4752dnl
    48 AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=1, USE_Z3950=0)
    49 if test USE_Z3950 = 1; then
    50 AC_DEFINE(USE_Z3950, $USE_Z3950)
     53AC_ARG_ENABLE(z3950, [  --enable-z3950          Enable Z39.50 client support], USE_Z3950=$enableval, USE_Z3950=no)
     54if test $USE_Z3950 = "yes" -o $USE_Z3950 = "1" ; then
     55  USE_Z3950=1
     56  AC_DEFINE(USE_Z3950,[])
     57else
     58  USE_Z3950=0
     59fi
    5160AC_SUBST(USE_Z3950)
    52 fi
    5361
    5462dnl
    5563dnl Set use of yaz - now compiled by default even when z3950 support not required
    5664dnl
    57 AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
    58 dnl if test USE_YAZ = 1; then
    59 AC_DEFINE(USE_YAZ, $USE_YAZ)
     65AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=$enableval, USE_YAZ=yes)
     66if test $USE_YAZ = "yes" -o $USE_YAZ = "1" ; then
     67  USE_YAZ=1
     68  AC_DEFINE(USE_YAZ,[])
     69else
     70  USE_YAZ=0
     71fi
    6072AC_SUBST(USE_YAZ)
    61 dnl fi
    6273
    6374dnl
    6475dnl disable compilation of accent folding stuff for mgpp (and one day mg)
    6576dnl
    66 AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
    67 AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
     77AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=$enableval, ENABLE_ACCENTFOLD=yes)
     78if test $ENABLE_ACCENTFOLD = "yes" -o $ENABLE_ACCENTFOLD = "1" ; then
     79  ENABLE_ACCENTFOLD=1
     80  AC_DEFINE(ENABLE_ACCENTFOLD,[])
     81else
     82  ENABLE_ACCENTFOLD=0
     83fi
    6884AC_SUBST(ENABLE_ACCENTFOLD)
    6985
     
    7187dnl Set use of SQLite (enabled by default)
    7288dnl
    73 AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=0, USE_SQLITE=1)
    74 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
     89AC_ARG_ENABLE(sqlite, [  --disable-sqlite        Disable SQLite support], USE_SQLITE=$enableval, USE_SQLITE=yes)
     90if test $USE_SQLITE = "yes" -o $USE_SQLITE = "1" ; then
     91  USE_SQLITE=1
     92  AC_DEFINE(USE_SQLITE,[])
     93else
     94  USE_SQLITE=0
     95fi
    7596AC_SUBST(USE_SQLITE)
    7697
     
    7899dnl Set use of Apache httpd (disabled by default)
    79100dnl
    80 AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=1, USE_APACHE_HTTPD=0)
    81 AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
    82 AC_SUBST(USE_APACHE_HTTPD)
     101if test -d runtime-src; then
     102   AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=$enableval, USE_APACHE_HTTPD=no)
     103   if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then
     104     USE_APACHE_HTTPD=1
     105     AC_DEFINE(USE_APACHE_HTTPD,[])
     106   else
     107     USE_APACHE_HTTPD=0
     108   fi
     109   AC_SUBST(USE_APACHE_HTTPD)
     110fi
    83111
    84112dnl
Note: See TracChangeset for help on using the changeset viewer.