Changeset 2836

Show
Ignore:
Timestamp:
10/15/07 12:30:22
Author:
jdapena
Message:

* m4/moz.m4: Fixed a typo
* configure.ac:

  • Undefine HAVE_MOZILLA_1_8 and HAVE_MOZILLA_1_9 for the case
    we don't run mozilla macros.
  • Fix some issues for default option of html component build
    (none intead of mozembed).
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.ac

    r2835 r2836  
    148148  ;; 
    149149  *) AC_MSG_ERROR(bad value ${with_html_component} for --with-html-component) ;; 
    150 esac], [build_mozembed=true 
     150esac], [build_mozembed=false 
    151151        build_webkit=false  
    152152        build_gtkhtml=false 
    153         with_html_component=mozembed]) 
     153        with_html_component=none]) 
    154154 
    155155AM_CONDITIONAL(BUILD_MOZEMBED, test x$build_mozembed = xtrue) 
    …… 
    400400  LIBTINYMAILUI_MOZEMBED_LIBS= 
    401401  MOZILLA_HOME= 
     402  AM_CONDITIONAL([HAVE_MOZILLA_1_8],[test "0" = "1"]) 
     403  AM_CONDITIONAL([HAVE_MOZILLA_1_9],[test "0" = "1"]) 
    402404fi 
    403405AC_SUBST([MOZILLA_HOME]) 

  • trunk/m4/moz.m4

    r2835 r2836  
    7979 
    8080 
    81 AM_CONDITIONAL([HAVE_MOZILLA_1_8],[test "mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "8"]) 
     81AM_CONDITIONAL([HAVE_MOZILLA_1_8],[test "$mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "8"]) 
    8282AM_CONDITIONAL([HAVE_MOZILLA_1_9],[test "$mozilla_major_version" = "1" -a "$mozilla_minor_version" -ge "9"]) 
    8383AC_DEFINE([MOZEMBED_MOZILLA_VERSION],["$mozilla_version"],[Detected mozilla engine version for mozembed])