Changeset 22068

Show
Ignore:
Timestamp:
10.05.2010 15:31:28 (9 years ago)
Author:
ak19
Message:

1. Configure files updated to set the USE_HTTPD at the runtime-src packages level. 2. runtime-src/packages/Makefile.in updated to delete its makefile upon distclean.

Location:
main/trunk/greenstone2/runtime-src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/configure

    r22058 r22068  
    14981498 
    14991499 
    1500 if test -d runtime-src; then 
    1501    # Check whether --enable-apache-httpd or --disable-apache-httpd was given. 
     1500# Check whether --enable-apache-httpd or --disable-apache-httpd was given. 
    15021501if test "${enable_apache_httpd+set}" = set; then 
    15031502  enableval="$enable_apache_httpd" 
     
    15061505  USE_APACHE_HTTPD=no 
    15071506fi; 
    1508    if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then 
    1509      USE_APACHE_HTTPD=1 
    1510      cat >>confdefs.h <<\_ACEOF 
     1507if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then 
     1508  USE_APACHE_HTTPD=1 
     1509  cat >>confdefs.h <<\_ACEOF 
    15111510#define USE_APACHE_HTTPD 
    15121511_ACEOF 
    15131512 
    1514    else 
    1515      USE_APACHE_HTTPD=0 
    1516    fi 
    1517  
    1518 fi 
     1513else 
     1514  USE_APACHE_HTTPD=0 
     1515fi 
     1516 
     1517 
    15191518 
    15201519# Check whether --enable-mg or --disable-mg was given. 
  • main/trunk/greenstone2/runtime-src/configure.in

    r22058 r22068  
    123123dnl Set use of Apache httpd (disabled by default) 
    124124dnl 
    125 if test -d runtime-src; then 
    126    AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=$enableval, USE_APACHE_HTTPD=no) 
    127    if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then 
    128      USE_APACHE_HTTPD=1 
    129      AC_DEFINE(USE_APACHE_HTTPD,[]) 
    130    else 
    131      USE_APACHE_HTTPD=0 
    132    fi 
    133    AC_SUBST(USE_APACHE_HTTPD) 
    134 fi 
     125AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=$enableval, USE_APACHE_HTTPD=no) 
     126if test $USE_APACHE_HTTPD = "yes" -o $USE_APACHE_HTTPD = "1" ; then 
     127  USE_APACHE_HTTPD=1 
     128  AC_DEFINE(USE_APACHE_HTTPD,[]) 
     129else 
     130  USE_APACHE_HTTPD=0 
     131fi 
     132AC_SUBST(USE_APACHE_HTTPD) 
     133 
    135134 
    136135dnl 
  • main/trunk/greenstone2/runtime-src/packages/Makefile.in

    r21887 r22068  
    156156 
    157157distclean: 
     158    rm -f Makefile  
    158159    for subdir in $(PACKAGEDIRS); do \ 
    159160          echo cleaning $@ in $$subdir; \