Show
Ignore:
Timestamp:
09/06/06 17:00:28 (2 years ago)
Author:
allenb
Message:

Merge from trunk: Using command: svn merge -r16:56 https://opensg.vrsource.org/svn/trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/configure.in

    r17 r60  
    4848ac_gdz_conf_package_gif='0' 
    4949ac_gdz_conf_package_gif_e1='0' 
    50 ac_gdz_conf_package_expat='0' 
    51 ac_gdz_conf_package_gif_expat='0' 
     50ac_gdz_conf_package_libxml='0' 
     51ac_gdz_conf_package_libxml='0' 
    5252ac_gdz_conf_package_efence='0' 
    5353ac_gdz_conf_package_efence_e1='0' 
    …… 
    634634fi 
    635635 
    636 dnl ############# EXPAT Settings ##################### 
    637  
    638 AC_ARG_WITH(expat,     [  --with-expat=DIR                    Where to find the expat files to use], 
    639                         ,with_expat=no)  
    640  
    641 if test "$with_expat" = yes; then 
    642         ac_gdz_expat_dir= 
    643         ac_gdz_conf_package_defs=$ac_gdz_conf_package_defs' -DOSG_WITH_EXPAT' 
    644 elif test "$with_expat" = no; then 
    645         ac_gdz_expat_dir= 
    646 else 
    647         ac_gdz_expat_dir=$with_expat 
    648         ac_gdz_conf_package_expat='1' 
    649         ac_gdz_conf_package_defs=$ac_gdz_conf_package_defs' -DOSG_WITH_EXPAT' 
     636dnl ############# CLAPACK Settings ##################### 
     637 
     638AC_ARG_WITH(libxml,     [  --with-libxml=DIR          Where to find the libxml files to use], 
     639                        ,with_libxml=no)  
     640 
     641if test "$with_libxml" = yes; then 
     642        ac_gdz_libxml_dir= 
     643        ac_gdz_conf_package_defs=$ac_gdz_conf_package_defs' -DOSG_WITH_LIBXML' 
     644elif test "$with_libxml" = no; then 
     645        ac_gdz_libxml_dir= 
     646else 
     647        ac_gdz_libxml_dir=$with_libxml 
     648        ac_gdz_conf_package_libxml='1' 
     649        ac_gdz_conf_package_defs=$ac_gdz_conf_package_defs' -DOSG_WITH_LIBXML' 
     650fi 
     651 
     652dnl ############# CLAPACK Settings ##################### 
     653 
     654AC_ARG_WITH(collada,     [  --with-collada=DIR          Where to find the collada files to use], 
     655                        ,with_collada=no)  
     656 
     657if test "$with_collada" = yes; then 
     658        ac_gdz_collada_dir= 
     659        ac_gdz_conf_package_defs=$ac_gdz_conf_package_defs' -DOSG_WITH_COLLADA' 
     660elif test "$with_collada" = no; then 
     661        ac_gdz_collada_dir= 
     662else 
     663        ac_gdz_collada_dir=$with_collada 
     664        ac_gdz_conf_package_collada='1' 
     665        ac_gdz_conf_package_defs=$ac_gdz_conf_package_defs' -DOSG_WITH_COLLADA' 
    650666fi 
    651667 
    …… 
    14301446AC_GDZ_WRITE_COMMON_GIF() 
    14311447 
    1432 AC_GDZ_WRITE_COMMON_EXPAT() 
     1448AC_GDZ_WRITE_COMMON_LIBXML() 
     1449 
     1450AC_GDZ_WRITE_COMMON_COLLADA() 
    14331451 
    14341452AC_GDZ_WRITE_COMMON_GL()