# # # rename "botan/README.botan-monotone" # to "botan/botan/README.botan-monotone" # # rename "botan/aes.cpp" # to "botan/botan/aes.cpp" # # rename "botan/aes.h" # to "botan/botan/aes.h" # # rename "botan/aes_tab.cpp" # to "botan/botan/aes_tab.cpp" # # rename "botan/alg_id.cpp" # to "botan/botan/alg_id.cpp" # # rename "botan/alg_id.h" # to "botan/botan/alg_id.h" # # rename "botan/allocate.h" # to "botan/botan/allocate.h" # # rename "botan/arc4.cpp" # to "botan/botan/arc4.cpp" # # rename "botan/arc4.h" # to "botan/botan/arc4.h" # # rename "botan/asn1_alt.cpp" # to "botan/botan/asn1_alt.cpp" # # rename "botan/asn1_att.cpp" # to "botan/botan/asn1_att.cpp" # # rename "botan/asn1_dn.cpp" # to "botan/botan/asn1_dn.cpp" # # rename "botan/asn1_int.cpp" # to "botan/botan/asn1_int.cpp" # # rename "botan/asn1_int.h" # to "botan/botan/asn1_int.h" # # rename "botan/asn1_ku.cpp" # to "botan/botan/asn1_ku.cpp" # # rename "botan/asn1_obj.h" # to "botan/botan/asn1_obj.h" # # rename "botan/asn1_oid.cpp" # to "botan/botan/asn1_oid.cpp" # # rename "botan/asn1_oid.h" # to "botan/botan/asn1_oid.h" # # rename "botan/asn1_str.cpp" # to "botan/botan/asn1_str.cpp" # # rename "botan/asn1_tm.cpp" # to "botan/botan/asn1_tm.cpp" # # rename "botan/base.cpp" # to "botan/botan/base.cpp" # # rename "botan/base.h" # to "botan/botan/base.h" # # rename "botan/base64.cpp" # to "botan/botan/base64.cpp" # # rename "botan/base64.h" # to "botan/botan/base64.h" # # rename "botan/basefilt.cpp" # to "botan/botan/basefilt.cpp" # # rename "botan/basefilt.h" # to "botan/botan/basefilt.h" # # rename "botan/ber_dec.cpp" # to "botan/botan/ber_dec.cpp" # # rename "botan/ber_dec.h" # to "botan/botan/ber_dec.h" # # rename "botan/big_base.cpp" # to "botan/botan/big_base.cpp" # # rename "botan/big_code.cpp" # to "botan/botan/big_code.cpp" # # rename "botan/big_io.cpp" # to "botan/botan/big_io.cpp" # # rename "botan/big_ops2.cpp" # to "botan/botan/big_ops2.cpp" # # rename "botan/big_ops3.cpp" # to "botan/botan/big_ops3.cpp" # # rename "botan/big_rand.cpp" # to "botan/botan/big_rand.cpp" # # rename "botan/bigint.h" # to "botan/botan/bigint.h" # # rename "botan/bit_ops.cpp" # to "botan/botan/bit_ops.cpp" # # rename "botan/bit_ops.h" # to "botan/botan/bit_ops.h" # # rename "botan/blinding.cpp" # to "botan/botan/blinding.cpp" # # rename "botan/blinding.h" # to "botan/botan/blinding.h" # # rename "botan/botan.h" # to "botan/botan/botan.h" # # rename "botan/buf_es.cpp" # to "botan/botan/buf_es.cpp" # # rename "botan/buf_es.h" # to "botan/botan/buf_es.h" # # rename "botan/buf_filt.cpp" # to "botan/botan/buf_filt.cpp" # # rename "botan/buf_filt.h" # to "botan/botan/buf_filt.h" # # rename "botan/build.h" # to "botan/botan/build.h" # # rename "botan/cbc.cpp" # to "botan/botan/cbc.cpp" # # rename "botan/cbc.h" # to "botan/botan/cbc.h" # # rename "botan/cbc_mac.cpp" # to "botan/botan/cbc_mac.cpp" # # rename "botan/cbc_mac.h" # to "botan/botan/cbc_mac.h" # # rename "botan/certstor.cpp" # to "botan/botan/certstor.cpp" # # rename "botan/certstor.h" # to "botan/botan/certstor.h" # # rename "botan/cfb.cpp" # to "botan/botan/cfb.cpp" # # rename "botan/cfb.h" # to "botan/botan/cfb.h" # # rename "botan/charset.cpp" # to "botan/botan/charset.cpp" # # rename "botan/charset.h" # to "botan/botan/charset.h" # # rename "botan/config.cpp" # to "botan/botan/config.cpp" # # rename "botan/config.h" # to "botan/botan/config.h" # # rename "botan/crc32.cpp" # to "botan/botan/crc32.cpp" # # rename "botan/crc32.h" # to "botan/botan/crc32.h" # # rename "botan/credits.txt" # to "botan/botan/credits.txt" # # rename "botan/crl_ent.cpp" # to "botan/botan/crl_ent.cpp" # # rename "botan/crl_ent.h" # to "botan/botan/crl_ent.h" # # rename "botan/ctr.cpp" # to "botan/botan/ctr.cpp" # # rename "botan/ctr.h" # to "botan/botan/ctr.h" # # rename "botan/cts.cpp" # to "botan/botan/cts.cpp" # # rename "botan/cts.h" # to "botan/botan/cts.h" # # rename "botan/data_snk.cpp" # to "botan/botan/data_snk.cpp" # # rename "botan/data_snk.h" # to "botan/botan/data_snk.h" # # rename "botan/data_src.cpp" # to "botan/botan/data_src.cpp" # # rename "botan/data_src.h" # to "botan/botan/data_src.h" # # rename "botan/datastor.cpp" # to "botan/botan/datastor.cpp" # # rename "botan/datastor.h" # to "botan/botan/datastor.h" # # rename "botan/def_alg.cpp" # to "botan/botan/def_alg.cpp" # # rename "botan/def_char.cpp" # to "botan/botan/def_char.cpp" # # rename "botan/def_char.h" # to "botan/botan/def_char.h" # # rename "botan/def_mode.cpp" # to "botan/botan/def_mode.cpp" # # rename "botan/def_ops.cpp" # to "botan/botan/def_ops.cpp" # # rename "botan/def_powm.cpp" # to "botan/botan/def_powm.cpp" # # rename "botan/def_powm.h" # to "botan/botan/def_powm.h" # # rename "botan/defalloc.cpp" # to "botan/botan/defalloc.cpp" # # rename "botan/defalloc.h" # to "botan/botan/defalloc.h" # # rename "botan/der_enc.cpp" # to "botan/botan/der_enc.cpp" # # rename "botan/der_enc.h" # to "botan/botan/der_enc.h" # # rename "botan/des.cpp" # to "botan/botan/des.cpp" # # rename "botan/des.h" # to "botan/botan/des.h" # # rename "botan/des_tab.cpp" # to "botan/botan/des_tab.cpp" # # rename "botan/dh.cpp" # to "botan/botan/dh.cpp" # # rename "botan/dh.h" # to "botan/botan/dh.h" # # rename "botan/divide.cpp" # to "botan/botan/divide.cpp" # # rename "botan/dl_algo.cpp" # to "botan/botan/dl_algo.cpp" # # rename "botan/dl_algo.h" # to "botan/botan/dl_algo.h" # # rename "botan/dl_group.cpp" # to "botan/botan/dl_group.cpp" # # rename "botan/dl_group.h" # to "botan/botan/dl_group.h" # # rename "botan/dlies.cpp" # to "botan/botan/dlies.cpp" # # rename "botan/dlies.h" # to "botan/botan/dlies.h" # # rename "botan/dsa_gen.cpp" # to "botan/botan/dsa_gen.cpp" # # rename "botan/eax.cpp" # to "botan/botan/eax.cpp" # # rename "botan/eax.h" # to "botan/botan/eax.h" # # rename "botan/ecb.cpp" # to "botan/botan/ecb.cpp" # # rename "botan/ecb.h" # to "botan/botan/ecb.h" # # rename "botan/eme.h" # to "botan/botan/eme.h" # # rename "botan/eme1.cpp" # to "botan/botan/eme1.cpp" # # rename "botan/eme_pkcs.cpp" # to "botan/botan/eme_pkcs.cpp" # # rename "botan/emsa.h" # to "botan/botan/emsa.h" # # rename "botan/emsa1.cpp" # to "botan/botan/emsa1.cpp" # # rename "botan/emsa2.cpp" # to "botan/botan/emsa2.cpp" # # rename "botan/emsa3.cpp" # to "botan/botan/emsa3.cpp" # # rename "botan/emsa4.cpp" # to "botan/botan/emsa4.cpp" # # rename "botan/emsa_raw.cpp" # to "botan/botan/emsa_raw.cpp" # # rename "botan/eng_base.cpp" # to "botan/botan/eng_base.cpp" # # rename "botan/eng_def.h" # to "botan/botan/eng_def.h" # # rename "botan/engine.cpp" # to "botan/botan/engine.cpp" # # rename "botan/engine.h" # to "botan/botan/engine.h" # # rename "botan/enums.h" # to "botan/botan/enums.h" # # rename "botan/es_capi.cpp" # to "botan/botan/es_capi.cpp" # # rename "botan/es_capi.h" # to "botan/botan/es_capi.h" # # rename "botan/es_dev.cpp" # to "botan/botan/es_dev.cpp" # # rename "botan/es_dev.h" # to "botan/botan/es_dev.h" # # rename "botan/es_egd.cpp" # to "botan/botan/es_egd.cpp" # # rename "botan/es_egd.h" # to "botan/botan/es_egd.h" # # rename "botan/es_win32.cpp" # to "botan/botan/es_win32.cpp" # # rename "botan/es_win32.h" # to "botan/botan/es_win32.h" # # rename "botan/exceptn.cpp" # to "botan/botan/exceptn.cpp" # # rename "botan/exceptn.h" # to "botan/botan/exceptn.h" # # rename "botan/filter.cpp" # to "botan/botan/filter.cpp" # # rename "botan/filter.h" # to "botan/botan/filter.h" # # rename "botan/filters.cpp" # to "botan/botan/filters.cpp" # # rename "botan/filters.h" # to "botan/botan/filters.h" # # rename "botan/fips140.cpp" # to "botan/botan/fips140.cpp" # # rename "botan/fips140.h" # to "botan/botan/fips140.h" # # rename "botan/get_algo.cpp" # to "botan/botan/get_algo.cpp" # # rename "botan/get_enc.cpp" # to "botan/botan/get_enc.cpp" # # rename "botan/get_pbe.cpp" # to "botan/botan/get_pbe.cpp" # # rename "botan/hash_id.cpp" # to "botan/botan/hash_id.cpp" # # rename "botan/hash_id.h" # to "botan/botan/hash_id.h" # # rename "botan/hex.cpp" # to "botan/botan/hex.cpp" # # rename "botan/hex.h" # to "botan/botan/hex.h" # # rename "botan/hmac.cpp" # to "botan/botan/hmac.cpp" # # rename "botan/hmac.h" # to "botan/botan/hmac.h" # # rename "botan/if_algo.cpp" # to "botan/botan/if_algo.cpp" # # rename "botan/if_algo.h" # to "botan/botan/if_algo.h" # # rename "botan/info.txt" # to "botan/botan/info.txt" # # rename "botan/init.h" # to "botan/botan/init.h" # # rename "botan/init_def.cpp" # to "botan/botan/init_def.cpp" # # rename "botan/init_opt.cpp" # to "botan/botan/init_opt.cpp" # # rename "botan/jacobi.cpp" # to "botan/botan/jacobi.cpp" # # rename "botan/kdf.cpp" # to "botan/botan/kdf.cpp" # # rename "botan/kdf.h" # to "botan/botan/kdf.h" # # rename "botan/keypair.cpp" # to "botan/botan/keypair.cpp" # # rename "botan/keypair.h" # to "botan/botan/keypair.h" # # rename "botan/libstate.cpp" # to "botan/botan/libstate.cpp" # # rename "botan/libstate.h" # to "botan/botan/libstate.h" # # rename "botan/license.txt" # to "botan/botan/license.txt" # # rename "botan/loadstor.h" # to "botan/botan/loadstor.h" # # rename "botan/look_add.h" # to "botan/botan/look_add.h" # # rename "botan/look_pk.cpp" # to "botan/botan/look_pk.cpp" # # rename "botan/look_pk.h" # to "botan/botan/look_pk.h" # # rename "botan/lookup.h" # to "botan/botan/lookup.h" # # rename "botan/make_prm.cpp" # to "botan/botan/make_prm.cpp" # # rename "botan/mdx_hash.cpp" # to "botan/botan/mdx_hash.cpp" # # rename "botan/mdx_hash.h" # to "botan/botan/mdx_hash.h" # # rename "botan/mem_ops.h" # to "botan/botan/mem_ops.h" # # rename "botan/mem_pool.cpp" # to "botan/botan/mem_pool.cpp" # # rename "botan/mem_pool.h" # to "botan/botan/mem_pool.h" # # rename "botan/mgf1.cpp" # to "botan/botan/mgf1.cpp" # # rename "botan/mgf1.h" # to "botan/botan/mgf1.h" # # rename "botan/mlock.cpp" # to "botan/botan/mlock.cpp" # # rename "botan/mode_pad.cpp" # to "botan/botan/mode_pad.cpp" # # rename "botan/mode_pad.h" # to "botan/botan/mode_pad.h" # # rename "botan/modebase.cpp" # to "botan/botan/modebase.cpp" # # rename "botan/modebase.h" # to "botan/botan/modebase.h" # # rename "botan/modules.cpp" # to "botan/botan/modules.cpp" # # rename "botan/modules.h" # to "botan/botan/modules.h" # # rename "botan/mp_asm.cpp" # to "botan/botan/mp_asm.cpp" # # rename "botan/mp_asm.h" # to "botan/botan/mp_asm.h" # # rename "botan/mp_asmi.h" # to "botan/botan/mp_asmi.h" # # rename "botan/mp_comba.cpp" # to "botan/botan/mp_comba.cpp" # # rename "botan/mp_core.h" # to "botan/botan/mp_core.h" # # rename "botan/mp_misc.cpp" # to "botan/botan/mp_misc.cpp" # # rename "botan/mp_mul.cpp" # to "botan/botan/mp_mul.cpp" # # rename "botan/mp_mulop.cpp" # to "botan/botan/mp_mulop.cpp" # # rename "botan/mp_numth.cpp" # to "botan/botan/mp_numth.cpp" # # rename "botan/mp_shift.cpp" # to "botan/botan/mp_shift.cpp" # # rename "botan/mp_sqr.cpp" # to "botan/botan/mp_sqr.cpp" # # rename "botan/mp_types.h" # to "botan/botan/mp_types.h" # # rename "botan/mutex.cpp" # to "botan/botan/mutex.cpp" # # rename "botan/mutex.h" # to "botan/botan/mutex.h" # # rename "botan/numthry.cpp" # to "botan/botan/numthry.cpp" # # rename "botan/numthry.h" # to "botan/botan/numthry.h" # # rename "botan/ofb.cpp" # to "botan/botan/ofb.cpp" # # rename "botan/ofb.h" # to "botan/botan/ofb.h" # # rename "botan/oids.cpp" # to "botan/botan/oids.cpp" # # rename "botan/oids.h" # to "botan/botan/oids.h" # # rename "botan/out_buf.cpp" # to "botan/botan/out_buf.cpp" # # rename "botan/out_buf.h" # to "botan/botan/out_buf.h" # # rename "botan/parsing.cpp" # to "botan/botan/parsing.cpp" # # rename "botan/parsing.h" # to "botan/botan/parsing.h" # # rename "botan/pbe.h" # to "botan/botan/pbe.h" # # rename "botan/pbe_pkcs.h" # to "botan/botan/pbe_pkcs.h" # # rename "botan/pbes1.cpp" # to "botan/botan/pbes1.cpp" # # rename "botan/pbes2.cpp" # to "botan/botan/pbes2.cpp" # # rename "botan/pem.cpp" # to "botan/botan/pem.cpp" # # rename "botan/pem.h" # to "botan/botan/pem.h" # # rename "botan/pipe.cpp" # to "botan/botan/pipe.cpp" # # rename "botan/pipe.h" # to "botan/botan/pipe.h" # # rename "botan/pipe_io.cpp" # to "botan/botan/pipe_io.cpp" # # rename "botan/pipe_rw.cpp" # to "botan/botan/pipe_rw.cpp" # # rename "botan/pk_algs.cpp" # to "botan/botan/pk_algs.cpp" # # rename "botan/pk_algs.h" # to "botan/botan/pk_algs.h" # # rename "botan/pk_core.cpp" # to "botan/botan/pk_core.cpp" # # rename "botan/pk_core.h" # to "botan/botan/pk_core.h" # # rename "botan/pk_filts.cpp" # to "botan/botan/pk_filts.cpp" # # rename "botan/pk_filts.h" # to "botan/botan/pk_filts.h" # # rename "botan/pk_keys.cpp" # to "botan/botan/pk_keys.cpp" # # rename "botan/pk_keys.h" # to "botan/botan/pk_keys.h" # # rename "botan/pk_ops.h" # to "botan/botan/pk_ops.h" # # rename "botan/pk_util.cpp" # to "botan/botan/pk_util.cpp" # # rename "botan/pk_util.h" # to "botan/botan/pk_util.h" # # rename "botan/pkcs10.cpp" # to "botan/botan/pkcs10.cpp" # # rename "botan/pkcs10.h" # to "botan/botan/pkcs10.h" # # rename "botan/pkcs5.cpp" # to "botan/botan/pkcs5.cpp" # # rename "botan/pkcs5.h" # to "botan/botan/pkcs5.h" # # rename "botan/pkcs8.cpp" # to "botan/botan/pkcs8.cpp" # # rename "botan/pkcs8.h" # to "botan/botan/pkcs8.h" # # rename "botan/policy.cpp" # to "botan/botan/policy.cpp" # # rename "botan/pow_mod.cpp" # to "botan/botan/pow_mod.cpp" # # rename "botan/pow_mod.h" # to "botan/botan/pow_mod.h" # # rename "botan/powm_fw.cpp" # to "botan/botan/powm_fw.cpp" # # rename "botan/powm_mnt.cpp" # to "botan/botan/powm_mnt.cpp" # # rename "botan/prf_x942.cpp" # to "botan/botan/prf_x942.cpp" # # rename "botan/primes.cpp" # to "botan/botan/primes.cpp" # # rename "botan/pubkey.cpp" # to "botan/botan/pubkey.cpp" # # rename "botan/pubkey.h" # to "botan/botan/pubkey.h" # # rename "botan/randpool.cpp" # to "botan/botan/randpool.cpp" # # rename "botan/randpool.h" # to "botan/botan/randpool.h" # # rename "botan/reducer.cpp" # to "botan/botan/reducer.cpp" # # rename "botan/reducer.h" # to "botan/botan/reducer.h" # # rename "botan/rng.cpp" # to "botan/botan/rng.cpp" # # rename "botan/rng.h" # to "botan/botan/rng.h" # # rename "botan/rsa.cpp" # to "botan/botan/rsa.cpp" # # rename "botan/rsa.h" # to "botan/botan/rsa.h" # # rename "botan/s2k.cpp" # to "botan/botan/s2k.cpp" # # rename "botan/s2k.h" # to "botan/botan/s2k.h" # # rename "botan/secmem.h" # to "botan/botan/secmem.h" # # rename "botan/secqueue.cpp" # to "botan/botan/secqueue.cpp" # # rename "botan/secqueue.h" # to "botan/botan/secqueue.h" # # rename "botan/sha160.cpp" # to "botan/botan/sha160.cpp" # # rename "botan/sha160.h" # to "botan/botan/sha160.h" # # rename "botan/sha256.cpp" # to "botan/botan/sha256.cpp" # # rename "botan/sha256.h" # to "botan/botan/sha256.h" # # rename "botan/stl_util.h" # to "botan/botan/stl_util.h" # # rename "botan/symkey.cpp" # to "botan/botan/symkey.cpp" # # rename "botan/symkey.h" # to "botan/botan/symkey.h" # # rename "botan/thanks.txt" # to "botan/botan/thanks.txt" # # rename "botan/timers.cpp" # to "botan/botan/timers.cpp" # # rename "botan/timers.h" # to "botan/botan/timers.h" # # rename "botan/types.h" # to "botan/botan/types.h" # # rename "botan/ui.cpp" # to "botan/botan/ui.cpp" # # rename "botan/ui.h" # to "botan/botan/ui.h" # # rename "botan/util.cpp" # to "botan/botan/util.cpp" # # rename "botan/util.h" # to "botan/botan/util.h" # # rename "botan/version.h" # to "botan/botan/version.h" # # rename "botan/x509_ca.cpp" # to "botan/botan/x509_ca.cpp" # # rename "botan/x509_ca.h" # to "botan/botan/x509_ca.h" # # rename "botan/x509_crl.cpp" # to "botan/botan/x509_crl.cpp" # # rename "botan/x509_crl.h" # to "botan/botan/x509_crl.h" # # rename "botan/x509_ext.cpp" # to "botan/botan/x509_ext.cpp" # # rename "botan/x509_ext.h" # to "botan/botan/x509_ext.h" # # rename "botan/x509_key.cpp" # to "botan/botan/x509_key.cpp" # # rename "botan/x509_key.h" # to "botan/botan/x509_key.h" # # rename "botan/x509_obj.cpp" # to "botan/botan/x509_obj.cpp" # # rename "botan/x509_obj.h" # to "botan/botan/x509_obj.h" # # rename "botan/x509cert.cpp" # to "botan/botan/x509cert.cpp" # # rename "botan/x509cert.h" # to "botan/botan/x509cert.h" # # rename "botan/x509find.cpp" # to "botan/botan/x509find.cpp" # # rename "botan/x509find.h" # to "botan/botan/x509find.h" # # rename "botan/x509opt.cpp" # to "botan/botan/x509opt.cpp" # # rename "botan/x509self.cpp" # to "botan/botan/x509self.cpp" # # rename "botan/x509self.h" # to "botan/botan/x509self.h" # # rename "botan/x509stat.cpp" # to "botan/botan/x509stat.cpp" # # rename "botan/x509stat.h" # to "botan/botan/x509stat.h" # # rename "botan/x509stor.cpp" # to "botan/botan/x509stor.cpp" # # rename "botan/x509stor.h" # to "botan/botan/x509stor.h" # # rename "botan/x931_rng.cpp" # to "botan/botan/x931_rng.cpp" # # rename "botan/x931_rng.h" # to "botan/botan/x931_rng.h" # # rename "botan/zlib.cpp" # to "botan/botan/zlib.cpp" # # rename "botan/zlib.h" # to "botan/botan/zlib.h" # # add_dir "botan/botan" # # add_file "m4/botan.m4" # content [3fe97c38a6a43c8b8fc257a7da5b80fb02e76c75] # # patch "Makefile.am" # from [d93d338b348a7a4b2012cfa2b4f91cf27ba5143c] # to [e5d1b48a600942440daacd35ea21cee06a4f6e0f] # # patch "NEWS" # from [d93a68b1714527e32ecc7b0e58f42e8b10ddb26b] # to [aef0a5b10d5feca008373c5ea717403ca4b5b1c7] # # patch "botan/botan/build.h" # from [c0d1fe737887005a2d8b6b7a0547af2d8d1df568] # to [6f73ca96c6bf890e3dae9938c41c0a36d01447ca] # # patch "configure.ac" # from [629652d97ca179fdd82f20455dd7d959bea7a527] # to [802bf4748be4bb0948c3c23116c0a32b85a4d19f] # # patch "visualc/config.h" # from [d033fd670698ba66d9a17667367fed468a909266] # to [9a75b8e28a1f7e07ddde1ac49b06ff3b278f2e55] # ============================================================ --- m4/botan.m4 3fe97c38a6a43c8b8fc257a7da5b80fb02e76c75 +++ m4/botan.m4 3fe97c38a6a43c8b8fc257a7da5b80fb02e76c75 @@ -0,0 +1,36 @@ +# Set up to use either a bundled or a system-provided version of Botan. +# +# If --with-system-botan is specified and the library cannot be found or is +# unsuitable, the configure script will error out rather than falling back +# to the bundled version. This is to avoid surprising a user who expected +# their system libbotan to be used. + +AC_DEFUN([MTN_LIB_BOTAN], +[AC_ARG_WITH([system-botan], + AC_HELP_STRING([--with-system-botan], + [use a system-provided copy of Botan instead of the default bundled + copy. (To use a specific installed version, use the environment + variables BOTAN_CPPFLAGS and/or BOTAN_LIBS.)]), + [case "$withval" in + ""|yes) with_system_botan=yes ;; + no) with_system_botan=no ;; + *) AC_MSG_ERROR([--with(out)-system-botan takes no argument]) ;; + esac], + [with_system_botan=no]) + if test "$with_system_botan" = yes; then + MTN_FIND_BOTAN + else + AC_DEFINE([BOTAN_STATIC],[1],[Define if using bundled botan]) + AC_MSG_NOTICE([using the bundled copy of Botan]) + fi + AM_CONDITIONAL([INCLUDED_BOTAN], [test $with_system_botan = no]) + AC_SUBST([BOTAN_CPPFLAGS]) + AC_SUBST([BOTAN_LIBS]) +]) + +AC_DEFUN([MTN_FIND_BOTAN], +[ + BOTAN_CPPFLAGS="`botan1.7-config --cflags`" + BOTAN_LIBS="`botan1.7-config --libs`" +]) + ============================================================ --- Makefile.am d93d338b348a7a4b2012cfa2b4f91cf27ba5143c +++ Makefile.am e5d1b48a600942440daacd35ea21cee06a4f6e0f @@ -104,102 +104,131 @@ BOTAN_SOURCES = \ netxx/types.h BOTAN_SOURCES = \ - botan/aes.cpp botan/aes_tab.cpp \ - botan/arc4.cpp botan/alg_id.cpp \ - botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp \ - botan/asn1_ku.cpp botan/asn1_oid.cpp \ - botan/asn1_str.cpp botan/asn1_tm.cpp \ - botan/base.cpp botan/base64.cpp botan/basefilt.cpp \ - botan/ber_dec.cpp botan/big_base.cpp \ - botan/big_code.cpp botan/big_io.cpp botan/big_ops2.cpp \ - botan/big_ops3.cpp botan/blinding.cpp botan/buf_es.cpp \ - botan/buf_filt.cpp botan/cbc.cpp botan/cbc_mac.cpp botan/certstor.cpp \ - botan/cfb.cpp botan/charset.cpp botan/crc32.cpp \ - botan/crl_ent.cpp botan/ctr.cpp botan/cts.cpp \ - botan/data_snk.cpp botan/data_src.cpp \ - botan/def_ops.cpp botan/defalloc.cpp \ - botan/der_enc.cpp botan/divide.cpp botan/dl_algo.cpp \ - botan/dl_group.cpp botan/dsa_gen.cpp \ - botan/dlies.cpp botan/eax.cpp botan/ecb.cpp botan/eme1.cpp \ - botan/eme_pkcs.cpp botan/emsa1.cpp botan/emsa2.cpp \ - botan/emsa3.cpp botan/emsa4.cpp botan/emsa_raw.cpp \ - botan/eng_base.cpp botan/engine.cpp botan/es_dev.cpp \ - botan/exceptn.cpp botan/filter.cpp botan/filters.cpp \ - botan/fips140.cpp \ - botan/get_algo.cpp botan/get_enc.cpp botan/get_pbe.cpp \ - botan/hash_id.cpp botan/hex.cpp botan/hmac.cpp \ - botan/if_algo.cpp botan/init_def.cpp \ - botan/kdf.cpp botan/keypair.cpp botan/look_pk.cpp \ - botan/make_prm.cpp botan/mdx_hash.cpp \ - botan/mem_pool.cpp botan/mgf1.cpp botan/mlock.cpp \ - botan/mode_pad.cpp botan/modebase.cpp \ - botan/mp_comba.cpp botan/mp_mulop.cpp \ - botan/mp_misc.cpp botan/mp_mul.cpp botan/mp_shift.cpp \ - botan/mutex.cpp botan/numthry.cpp \ - botan/ofb.cpp botan/oids.cpp botan/parsing.cpp botan/pbes1.cpp \ - botan/pbes2.cpp botan/pem.cpp botan/pipe.cpp botan/pipe_io.cpp \ - botan/pipe_rw.cpp botan/pk_algs.cpp botan/pk_core.cpp \ - botan/pk_filts.cpp botan/pk_keys.cpp botan/pk_util.cpp \ - botan/pkcs10.cpp botan/pkcs8.cpp botan/policy.cpp \ - botan/pow_mod.cpp \ - botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp \ - botan/randpool.cpp botan/reducer.cpp botan/rng.cpp \ - botan/rsa.cpp botan/s2k.cpp botan/secqueue.cpp \ - botan/sha160.cpp botan/symkey.cpp botan/timers.cpp \ - botan/ui.cpp botan/util.cpp botan/x509_ca.cpp \ - botan/x509_crl.cpp botan/x509_key.cpp botan/x509_obj.cpp \ - botan/x509cert.cpp botan/x509find.cpp botan/x509opt.cpp \ - botan/des.cpp botan/des_tab.cpp botan/pkcs5.cpp \ - botan/x509self.cpp botan/x509stor.cpp \ - botan/def_alg.cpp botan/def_mode.cpp botan/sha256.cpp \ - botan/x931_rng.cpp botan/out_buf.cpp botan/bit_ops.cpp \ - botan/big_rand.cpp botan/def_powm.cpp botan/libstate.cpp \ - botan/modules.cpp botan/mp_numth.cpp \ - botan/mp_sqr.cpp botan/powm_fw.cpp \ - botan/powm_mnt.cpp botan/mp_asm.cpp \ - botan/asn1_int.cpp botan/config.cpp botan/datastor.cpp \ - botan/def_char.cpp botan/init_opt.cpp botan/jacobi.cpp \ - botan/x509_ext.cpp botan/x509stat.cpp botan/dh.cpp \ + botan/botan/aes.cpp botan/botan/aes_tab.cpp \ + botan/botan/arc4.cpp botan/botan/alg_id.cpp \ + botan/botan/asn1_alt.cpp botan/botan/asn1_att.cpp \ + botan/botan/asn1_dn.cpp botan/botan/asn1_oid.cpp \ + botan/botan/asn1_str.cpp botan/botan/asn1_tm.cpp \ + botan/botan/base.cpp botan/botan/base64.cpp \ + botan/botan/basefilt.cpp botan/botan/ber_dec.cpp \ + botan/botan/big_base.cpp botan/botan/big_code.cpp \ + botan/botan/big_io.cpp botan/botan/big_ops2.cpp \ + botan/botan/big_ops3.cpp botan/botan/blinding.cpp \ + botan/botan/buf_es.cpp botan/botan/buf_filt.cpp \ + botan/botan/cbc.cpp botan/botan/cbc_mac.cpp \ + botan/botan/certstor.cpp botan/botan/cfb.cpp \ + botan/botan/charset.cpp botan/botan/crc32.cpp \ + botan/botan/crl_ent.cpp botan/botan/ctr.cpp botan/botan/cts.cpp \ + botan/botan/data_snk.cpp botan/botan/data_src.cpp \ + botan/botan/def_ops.cpp botan/botan/defalloc.cpp \ + botan/botan/der_enc.cpp botan/botan/divide.cpp \ + botan/botan/dl_algo.cpp botan/botan/dl_group.cpp \ + botan/botan/dsa_gen.cpp botan/botan/dlies.cpp \ + botan/botan/eax.cpp botan/botan/ecb.cpp botan/botan/eme1.cpp \ + botan/botan/eme_pkcs.cpp botan/botan/emsa1.cpp \ + botan/botan/emsa2.cpp botan/botan/emsa3.cpp \ + botan/botan/emsa4.cpp botan/botan/emsa_raw.cpp \ + botan/botan/eng_base.cpp botan/botan/engine.cpp \ + botan/botan/es_dev.cpp botan/botan/exceptn.cpp \ + botan/botan/filter.cpp botan/botan/filters.cpp \ + botan/botan/fips140.cpp botan/botan/get_algo.cpp \ + botan/botan/get_enc.cpp botan/botan/get_pbe.cpp \ + botan/botan/hash_id.cpp botan/botan/hex.cpp \ + botan/botan/hmac.cpp botan/botan/if_algo.cpp \ + botan/botan/init_def.cpp botan/botan/kdf.cpp \ + botan/botan/keypair.cpp botan/botan/look_pk.cpp \ + botan/botan/make_prm.cpp botan/botan/mdx_hash.cpp \ + botan/botan/mem_pool.cpp botan/botan/mgf1.cpp \ + botan/botan/mlock.cpp botan/botan/mode_pad.cpp \ + botan/botan/modebase.cpp botan/botan/mp_comba.cpp \ + botan/botan/mp_mulop.cpp botan/botan/mp_misc.cpp \ + botan/botan/mp_mul.cpp botan/botan/mp_shift.cpp \ + botan/botan/mutex.cpp botan/botan/numthry.cpp \ + botan/botan/ofb.cpp botan/botan/oids.cpp \ + botan/botan/parsing.cpp botan/botan/pbes1.cpp \ + botan/botan/pbes2.cpp botan/botan/pem.cpp botan/botan/pipe.cpp \ + botan/botan/pipe_io.cpp botan/botan/pipe_rw.cpp \ + botan/botan/pk_algs.cpp botan/botan/pk_core.cpp \ + botan/botan/pk_filts.cpp botan/botan/pk_keys.cpp \ + botan/botan/pk_util.cpp botan/botan/pkcs10.cpp \ + botan/botan/pkcs8.cpp botan/botan/policy.cpp \ + botan/botan/pow_mod.cpp botan/botan/prf_x942.cpp \ + botan/botan/primes.cpp botan/botan/pubkey.cpp \ + botan/botan/randpool.cpp botan/botan/reducer.cpp \ + botan/botan/rng.cpp botan/botan/rsa.cpp botan/botan/s2k.cpp \ + botan/botan/secqueue.cpp botan/botan/sha160.cpp \ + botan/botan/symkey.cpp botan/botan/timers.cpp \ + botan/botan/ui.cpp botan/botan/util.cpp botan/botan/x509_ca.cpp \ + botan/botan/x509_crl.cpp botan/botan/x509_key.cpp \ + botan/botan/x509_obj.cpp botan/botan/x509cert.cpp \ + botan/botan/x509find.cpp botan/botan/x509opt.cpp \ + botan/botan/des.cpp botan/botan/des_tab.cpp \ + botan/botan/pkcs5.cpp botan/botan/x509self.cpp \ + botan/botan/x509stor.cpp botan/botan/def_alg.cpp \ + botan/botan/def_mode.cpp botan/botan/sha256.cpp \ + botan/botan/x931_rng.cpp botan/botan/out_buf.cpp \ + botan/botan/bit_ops.cpp botan/botan/big_rand.cpp \ + botan/botan/def_powm.cpp botan/botan/libstate.cpp \ + botan/botan/modules.cpp botan/botan/mp_numth.cpp \ + botan/botan/mp_sqr.cpp botan/botan/powm_fw.cpp \ + botan/botan/powm_mnt.cpp botan/botan/mp_asm.cpp \ + botan/botan/asn1_int.cpp botan/botan/config.cpp \ + botan/botan/datastor.cpp botan/botan/def_char.cpp \ + botan/botan/init_opt.cpp botan/botan/jacobi.cpp \ + botan/botan/x509_ext.cpp botan/botan/x509stat.cpp \ + botan/botan/dh.cpp \ \ - botan/aes.h botan/botan.h botan/es_win32.h \ - botan/lookup.h botan/randpool.h botan/version.h \ - botan/buf_es.h botan/der_enc.h \ - botan/exceptn.h botan/mdx_hash.h \ - botan/reducer.h botan/x509_ca.h botan/allocate.h \ - botan/buf_filt.h botan/dh.h botan/filter.h botan/mem_ops.h \ - botan/pbe.h botan/rng.h botan/x509cert.h botan/arc4.h \ - botan/cbc.h botan/dl_algo.h botan/filters.h botan/mem_pool.h \ - botan/pbe_pkcs.h botan/rsa.h botan/x509_crl.h \ - botan/certstor.h botan/dlies.h botan/fips140.h botan/mgf1.h \ - botan/pem.h botan/s2k.h botan/x509_key.h botan/asn1_obj.h \ - botan/cfb.h botan/modebase.h \ - botan/pipe.h botan/x509_obj.h \ - botan/asn1_oid.h botan/eax.h \ - botan/mode_pad.h botan/pk_algs.h botan/secmem.h \ - botan/x509find.h botan/x509self.h botan/config.h botan/ecb.h \ - botan/hex.h botan/pk_core.h botan/secqueue.h \ - botan/x509stor.h botan/base64.h botan/crc32.h botan/eme.h \ - botan/hmac.h botan/mp_core.h botan/pkcs10.h botan/sha160.h \ - botan/crl_ent.h botan/emsa.h botan/eng_def.h \ - botan/if_algo.h botan/pkcs8.h \ - botan/basefilt.h botan/ctr.h botan/engine.h botan/es_dev.h \ - botan/init.h botan/mp_types.h botan/pk_filts.h botan/symkey.h \ - botan/base.h botan/cts.h botan/enums.h botan/kdf.h \ - botan/mutex.h botan/pk_keys.h botan/timers.h botan/ber_dec.h \ - botan/data_snk.h botan/es_capi.h botan/keypair.h \ - botan/numthry.h botan/pk_ops.h botan/types.h botan/bigint.h \ - botan/data_src.h botan/es_egd.h botan/look_add.h botan/ofb.h \ - botan/pk_util.h botan/ui.h botan/blinding.h botan/defalloc.h \ - botan/look_pk.h botan/oids.h botan/pubkey.h \ - botan/util.h botan/charset.h botan/hash_id.h \ - botan/des.h botan/pkcs5.h \ - botan/x931_rng.h botan/sha256.h \ - botan/parsing.h botan/out_buf.h botan/bit_ops.h \ - botan/def_powm.h botan/dl_group.h botan/libstate.h \ - botan/modules.h botan/mp_asm.h botan/pow_mod.h botan/mp_asmi.h \ - botan/build.h botan/asn1_int.h botan/datastor.h botan/def_char.h \ - botan/stl_util.h botan/x509_ext.h botan/x509stat.h \ - botan/alg_id.h botan/cbc_mac.h botan/loadstor.h + botan/botan/aes.h botan/botan/botan.h botan/botan/es_win32.h \ + botan/botan/lookup.h botan/botan/randpool.h \ + botan/botan/version.h botan/botan/buf_es.h \ + botan/botan/der_enc.h botan/botan/exceptn.h \ + botan/botan/mdx_hash.h botan/botan/reducer.h \ + botan/botan/x509_ca.h botan/botan/allocate.h \ + botan/botan/buf_filt.h botan/botan/dh.h botan/botan/filter.h \ + botan/botan/mem_ops.h botan/botan/pbe.h \ + botan/botan/rng.h botan/botan/x509cert.h botan/botan/arc4.h \ + botan/botan/cbc.h botan/botan/dl_algo.h botan/botan/filters.h \ + botan/botan/mem_pool.h botan/botan/pbe_pkcs.h botan/botan/rsa.h \ + botan/botan/x509_crl.h botan/botan/certstor.h \ + botan/botan/dlies.h botan/botan/fips140.h botan/botan/mgf1.h \ + botan/botan/pem.h botan/botan/s2k.h botan/botan/x509_key.h \ + botan/botan/asn1_obj.h botan/botan/cfb.h botan/botan/modebase.h \ + botan/botan/pipe.h botan/botan/x509_obj.h \ + botan/botan/asn1_oid.h botan/botan/eax.h botan/botan/mode_pad.h \ + botan/botan/pk_algs.h botan/botan/secmem.h \ + botan/botan/x509find.h botan/botan/x509self.h \ + botan/botan/config.h botan/botan/ecb.h botan/botan/hex.h \ + botan/botan/pk_core.h botan/botan/secqueue.h \ + botan/botan/x509stor.h botan/botan/base64.h botan/botan/crc32.h \ + botan/botan/eme.h botan/botan/hmac.h botan/botan/mp_core.h \ + botan/botan/pkcs10.h botan/botan/sha160.h botan/botan/crl_ent.h \ + botan/botan/emsa.h botan/botan/eng_def.h botan/botan/if_algo.h \ + botan/botan/pkcs8.h botan/botan/basefilt.h botan/botan/ctr.h \ + botan/botan/engine.h botan/botan/es_dev.h botan/botan/init.h \ + botan/botan/mp_types.h botan/botan/pk_filts.h \ + botan/botan/symkey.h botan/botan/base.h botan/botan/cts.h \ + botan/botan/enums.h botan/botan/kdf.h botan/botan/mutex.h \ + botan/botan/pk_keys.h botan/botan/timers.h \ + botan/botan/ber_dec.h botan/botan/data_snk.h \ + botan/botan/es_capi.h botan/botan/keypair.h \ + botan/botan/numthry.h botan/botan/pk_ops.h botan/botan/types.h \ + botan/botan/bigint.h botan/botan/data_src.h \ + botan/botan/es_egd.h botan/botan/look_add.h botan/botan/ofb.h \ + botan/botan/pk_util.h botan/botan/ui.h botan/botan/blinding.h \ + botan/botan/defalloc.h botan/botan/look_pk.h botan/botan/oids.h \ + botan/botan/pubkey.h botan/botan/util.h botan/botan/charset.h \ + botan/botan/hash_id.h botan/botan/des.h botan/botan/pkcs5.h \ + botan/botan/x931_rng.h botan/botan/sha256.h \ + botan/botan/parsing.h botan/botan/out_buf.h \ + botan/botan/bit_ops.h botan/botan/def_powm.h \ + botan/botan/dl_group.h botan/botan/libstate.h \ + botan/botan/modules.h botan/botan/mp_asm.h \ + botan/botan/pow_mod.h botan/botan/mp_asmi.h botan/botan/build.h \ + botan/botan/asn1_int.h botan/botan/datastor.h \ + botan/botan/def_char.h botan/botan/stl_util.h \ + botan/botan/x509_ext.h botan/botan/x509stat.h \ + botan/botan/alg_id.h botan/botan/cbc_mac.h \ + botan/botan/loadstor.h BOOST_SANDBOX_SOURCES = \ boost/circular_buffer_adaptor.hpp \ @@ -360,7 +389,6 @@ lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_ noinst_LIBRARIES = libplatform.a lib3rdparty.a libplatform_a_SOURCES = platform.hh tester-plaf.hh lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \ - $(BOTAN_SOURCES) \ $(IDNA_SOURCES) \ $(NETXX_SOURCES) \ $(LUA_SOURCES) \ @@ -370,6 +398,10 @@ endif lib3rdparty_a_SOURCES += $(PCRE_SOURCES) endif +if INCLUDED_BOTAN +lib3rdparty_a_SOURCES += $(BOTAN_SOURCES) +endif + htmldir = $(datadir)/doc/monotone html_DATA = monotone.html @@ -443,13 +475,30 @@ endif tester_LDADD += $(PCRE_LIBS) endif +if INCLUDED_BOTAN + lib3rdparty_a_CPPFLAGS += -I$(top_srcdir)/botan + mtn_CPPFLAGS += -I$(top_srcdir)/botan + unit_tester_CPPFLAGS += -I$(top_srcdir)/botan + tester_CPPFLAGS += -I$(top_srcdir)/botan +else + mtn_CPPFLAGS += $(BOTAN_CPPFLAGS) + unit_tester_CPPFLAGS += $(BOTAN_CPPFLAGS) + tester_CPPFLAGS += $(BOTAN_CPPFLAGS) + + mtn_LDADD += $(BOTAN_LIBS) + unit_tester_LDADD += $(BOTAN_LIBS) + tester_LDADD += $(BOTAN_LIBS) +endif + if WIN32_PLATFORM libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES) mtn_SOURCES += win32/main.cc mtn_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi unit_tester_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi - lib3rdparty_a_CPPFLAGS += -DWIN32 -DBOTAN_EXT_ENTROPY_SRC_CAPI -DBOTAN_EXT_ENTROPY_SRC_WIN32 - lib3rdparty_a_SOURCES += botan/es_capi.cpp botan/es_win32.cpp + lib3rdparty_a_CPPFLAGS += -DWIN32 + if INCLUDED_BOTAN + lib3rdparty_a_SOURCES += botan/botan/es_capi.cpp botan/botan/es_win32.cpp + endif tester_SOURCES += win32/tester-plaf.cc else libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES) ============================================================ --- NEWS d93a68b1714527e32ecc7b0e58f42e8b10ddb26b +++ NEWS aef0a5b10d5feca008373c5ea717403ca4b5b1c7 @@ -24,6 +24,11 @@ will insist on this version and no other. See m4/pcre.m4 for further discussion. + - The internal copy of botan has been updated to version 1.7.3. + A new configure switch '--with-system-botan' allows you to + compile motonone against a system provided botan library, which + might contain optimizations for amd64 and ia32. + Bugs fixed - for changes near the beginning of a file, mtn's unified diff ============================================================ --- botan/build.h c0d1fe737887005a2d8b6b7a0547af2d8d1df568 +++ botan/botan/build.h 6f73ca96c6bf890e3dae9938c41c0a36d01447ca @@ -6,9 +6,17 @@ #ifndef BOTAN_BUILD_CONFIG_H__ #define BOTAN_BUILD_CONFIG_H__ +#include + +#ifndef BOTAN_STATIC +#error This is an include file from botan shipped with \ + monotone. Please make sure not to include it when \ + specifying --with-system-botan. +#endif + #define BOTAN_VERSION_MAJOR 1 #define BOTAN_VERSION_MINOR 7 -#define BOTAN_VERSION_PATCH 2 +#define BOTAN_VERSION_PATCH 3 #define BOTAN_MP_WORD_BITS 32 #define BOTAN_DEFAULT_BUFFER_SIZE 4096 ============================================================ --- configure.ac 629652d97ca179fdd82f20455dd7d959bea7a527 +++ configure.ac 802bf4748be4bb0948c3c23116c0a32b85a4d19f @@ -141,6 +141,8 @@ MTN_LIB_PCRE MTN_LIB_PCRE +MTN_LIB_BOTAN + # check for all things boost-related BOOST_VERSION_CHECK BOOST_VERSION_SPECIFIC_BUGS ============================================================ --- visualc/config.h d033fd670698ba66d9a17667367fed468a909266 +++ visualc/config.h 9a75b8e28a1f7e07ddde1ac49b06ff3b278f2e55 @@ -17,6 +17,9 @@ typedef unsigned int os_err_t; /* Define if using bundled pcre */ #define PCRE_STATIC 1 +/* Define if using bundled botan */ +#define BOTAN_STATIC 1 + /* Type to use for `s16'. */ #define TYPE_S16 short