diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/botan-config.in | 53 | ||||
| -rw-r--r-- | src/cmd/main.cpp | 2 | ||||
| -rw-r--r-- | src/contrib/perl-xs/Makefile.PL | 4 | ||||
| -rw-r--r-- | src/lib/compression/bzip2/info.txt | 2 | ||||
| -rw-r--r-- | src/lib/compression/lzma/info.txt | 2 | ||||
| -rw-r--r-- | src/lib/compression/zlib/info.txt | 2 | ||||
| -rw-r--r-- | src/lib/vendor/boost/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/vendor/openssl/info.txt | 2 | ||||
| -rw-r--r-- | src/lib/vendor/sqlite3/info.txt | 2 | ||||
| -rwxr-xr-x | src/scripts/install.py | 4 |
10 files changed, 11 insertions, 66 deletions
diff --git a/src/build-data/botan-config.in b/src/build-data/botan-config.in deleted file mode 100644 index e8d8bc2c1..000000000 --- a/src/build-data/botan-config.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -prefix=%{prefix} -includedir=%{includedir}/botan-%{version_major}.%{version_minor} -libdir=%{libdir} - -prefix= - -usage() -{ - echo "$0 [--prefix[=DIR]] [--version] [--libs] [--cflags]" - exit 1 -} - -if test $# -eq 0; then - usage -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - case "$1" in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo $prefix - ;; - --version) - echo %{version} - exit 0 - ;; - --cflags) - echo -I$prefix/$includedir - ;; - --libs) - if [ $prefix != "/usr" ] - then - echo -L$prefix/$libdir -lbotan-%{version_major}.%{version_minor} %{link_to} - else - echo -lbotan-%{version_major}.%{version_minor} %{link_to} - fi - ;; - *) - usage - ;; - esac - shift -done - -exit 0 diff --git a/src/cmd/main.cpp b/src/cmd/main.cpp index 4b1e9a62d..acb221354 100644 --- a/src/cmd/main.cpp +++ b/src/cmd/main.cpp @@ -83,7 +83,7 @@ int config(int argc, char* argv[]) else { - std::cerr << "Unknown option " << arg << " to botan-config\n"; + std::cerr << "Unknown option " << arg << " to botan config\n"; return 1; } diff --git a/src/contrib/perl-xs/Makefile.PL b/src/contrib/perl-xs/Makefile.PL index 5a3276aec..ab28bff1f 100644 --- a/src/contrib/perl-xs/Makefile.PL +++ b/src/contrib/perl-xs/Makefile.PL @@ -9,8 +9,8 @@ if ( $^O eq 'MSWin32' ) else { $cc = 'g++'; - $cflags = $Config::Config{ccflags} . ' -Wno-write-strings -fexceptions ' . qx( botan-config-1.11 --cflags ); - $libs = qx( botan-config --libs ); + $cflags = $Config::Config{ccflags} . ' -Wno-write-strings -fexceptions ' . qx( botan config --cflags ); + $libs = qx( botan config --libs ); } WriteMakefile( diff --git a/src/lib/compression/bzip2/info.txt b/src/lib/compression/bzip2/info.txt index a0f8d82ee..ea2efa6f1 100644 --- a/src/lib/compression/bzip2/info.txt +++ b/src/lib/compression/bzip2/info.txt @@ -1,6 +1,6 @@ define BZIP2_TRANSFORM 20141118 -load_on request +load_on vendor <libs> all -> bz2 diff --git a/src/lib/compression/lzma/info.txt b/src/lib/compression/lzma/info.txt index 1ec668ca8..443a96919 100644 --- a/src/lib/compression/lzma/info.txt +++ b/src/lib/compression/lzma/info.txt @@ -1,6 +1,6 @@ define LZMA_TRANSFORM 20141118 -load_on request +load_on vendor <libs> all -> lzma diff --git a/src/lib/compression/zlib/info.txt b/src/lib/compression/zlib/info.txt index ba5abd4ec..8b722350f 100644 --- a/src/lib/compression/zlib/info.txt +++ b/src/lib/compression/zlib/info.txt @@ -1,6 +1,6 @@ define ZLIB_TRANSFORM 20141118 -load_on request +load_on vendor <libs> all -> z diff --git a/src/lib/vendor/boost/info.txt b/src/lib/vendor/boost/info.txt index 119a54175..c335dcd74 100644 --- a/src/lib/vendor/boost/info.txt +++ b/src/lib/vendor/boost/info.txt @@ -1,8 +1,10 @@ define BOOST_FILESYSTEM 20131228 define BOOST_ASIO 20131228 +load_on vendor + <libs> all -> boost_system,boost_filesystem </libs> -load_on request + diff --git a/src/lib/vendor/openssl/info.txt b/src/lib/vendor/openssl/info.txt index fe0ca9ced..a1faac3e3 100644 --- a/src/lib/vendor/openssl/info.txt +++ b/src/lib/vendor/openssl/info.txt @@ -1,4 +1,4 @@ -load_on request +load_on vendor <libs> all -> crypto diff --git a/src/lib/vendor/sqlite3/info.txt b/src/lib/vendor/sqlite3/info.txt index 6370f4b2b..98ce5f796 100644 --- a/src/lib/vendor/sqlite3/info.txt +++ b/src/lib/vendor/sqlite3/info.txt @@ -1,5 +1,5 @@ -load_on request +load_on vendor <libs> all -> sqlite3 diff --git a/src/scripts/install.py b/src/scripts/install.py index 00174ee83..69d3a4286 100755 --- a/src/scripts/install.py +++ b/src/scripts/install.py @@ -171,10 +171,6 @@ def main(args = None): copy_executable(os.path.join(out_dir, app_exe), os.path.join(bin_dir, app_exe)) - if 'botan_config' in cfg: - copy_executable(cfg['botan_config'], - os.path.join(bin_dir, os.path.basename(cfg['botan_config']))) - if 'botan_pkgconfig' in cfg: pkgconfig_dir = os.path.join(options.destdir, options.libdir, options.pkgconfigdir) makedirs(pkgconfig_dir) |