diff options
author | David Walter Seikel | 2011-10-11 18:04:00 +1000 |
---|---|---|
committer | David Walter Seikel | 2011-10-11 18:04:00 +1000 |
commit | 2621f30025b4ddd63272b998c050912e1b0d2265 (patch) | |
tree | 1145fb5160f44ce5abf509be4a062a4c678f732e /linden/indra/libgcrypt | |
parent | Um, no, SL does not get it's own country, Especiall one that usurps some othe... (diff) | |
download | meta-impy-2621f30025b4ddd63272b998c050912e1b0d2265.zip meta-impy-2621f30025b4ddd63272b998c050912e1b0d2265.tar.gz meta-impy-2621f30025b4ddd63272b998c050912e1b0d2265.tar.bz2 meta-impy-2621f30025b4ddd63272b998c050912e1b0d2265.tar.xz |
Odd things happen when compiling the test directory under 32 bit linux, but we don't need it anyway.
Diffstat (limited to 'linden/indra/libgcrypt')
4 files changed, 5 insertions, 7 deletions
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.am b/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.am index ad00307..a55c723 100644 --- a/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.am +++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.am | |||
@@ -20,8 +20,8 @@ | |||
20 | ACLOCAL_AMFLAGS = -I m4 | 20 | ACLOCAL_AMFLAGS = -I m4 |
21 | AUTOMAKE_OPTIONS = dist-bzip2 | 21 | AUTOMAKE_OPTIONS = dist-bzip2 |
22 | 22 | ||
23 | DIST_SUBDIRS = mpi cipher src doc tests w32-dll | 23 | DIST_SUBDIRS = mpi cipher src doc w32-dll |
24 | SUBDIRS = mpi cipher src doc tests | 24 | SUBDIRS = mpi cipher src doc |
25 | EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN | 25 | EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN |
26 | DISTCLEANFILES = | 26 | DISTCLEANFILES = |
27 | 27 | ||
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.in b/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.in index 1125383..30fed3d 100644 --- a/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.in +++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/Makefile.in | |||
@@ -223,8 +223,8 @@ target_os = @target_os@ | |||
223 | target_vendor = @target_vendor@ | 223 | target_vendor = @target_vendor@ |
224 | ACLOCAL_AMFLAGS = -I m4 | 224 | ACLOCAL_AMFLAGS = -I m4 |
225 | AUTOMAKE_OPTIONS = dist-bzip2 | 225 | AUTOMAKE_OPTIONS = dist-bzip2 |
226 | DIST_SUBDIRS = mpi cipher src doc tests w32-dll | 226 | DIST_SUBDIRS = mpi cipher src doc w32-dll |
227 | SUBDIRS = mpi cipher src doc tests | 227 | SUBDIRS = mpi cipher src doc |
228 | EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN | 228 | EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN |
229 | DISTCLEANFILES = | 229 | DISTCLEANFILES = |
230 | all: config.h | 230 | all: config.h |
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/configure b/linden/indra/libgcrypt/libgcrypt-1.2.2/configure index 03ed49c..4961b55 100755 --- a/linden/indra/libgcrypt/libgcrypt-1.2.2/configure +++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/configure | |||
@@ -25245,7 +25245,7 @@ LIBGCRYPT_PUBKEY_CIPHERS=$enabled_pubkey_ciphers | |||
25245 | LIBGCRYPT_DIGESTS=$enabled_digests | 25245 | LIBGCRYPT_DIGESTS=$enabled_digests |
25246 | 25246 | ||
25247 | 25247 | ||
25248 | ac_config_files="$ac_config_files Makefile mpi/Makefile cipher/Makefile doc/Makefile src/Makefile src/libgcrypt-config tests/Makefile w32-dll/Makefile" | 25248 | ac_config_files="$ac_config_files Makefile mpi/Makefile cipher/Makefile doc/Makefile src/Makefile src/libgcrypt-config w32-dll/Makefile" |
25249 | 25249 | ||
25250 | cat >confcache <<\_ACEOF | 25250 | cat >confcache <<\_ACEOF |
25251 | # This file is a shell script that caches the results of configure | 25251 | # This file is a shell script that caches the results of configure |
@@ -25840,7 +25840,6 @@ do | |||
25840 | "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; | 25840 | "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; |
25841 | "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; | 25841 | "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; |
25842 | "src/libgcrypt-config" ) CONFIG_FILES="$CONFIG_FILES src/libgcrypt-config" ;; | 25842 | "src/libgcrypt-config" ) CONFIG_FILES="$CONFIG_FILES src/libgcrypt-config" ;; |
25843 | "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; | ||
25844 | "w32-dll/Makefile" ) CONFIG_FILES="$CONFIG_FILES w32-dll/Makefile" ;; | 25843 | "w32-dll/Makefile" ) CONFIG_FILES="$CONFIG_FILES w32-dll/Makefile" ;; |
25845 | ""$mpi_ln_list"" ) CONFIG_LINKS="$CONFIG_LINKS "$mpi_ln_list"" ;; | 25844 | ""$mpi_ln_list"" ) CONFIG_LINKS="$CONFIG_LINKS "$mpi_ln_list"" ;; |
25846 | "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | 25845 | "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/configure.ac b/linden/indra/libgcrypt/libgcrypt-1.2.2/configure.ac index 4f58e31..4750413 100644 --- a/linden/indra/libgcrypt/libgcrypt-1.2.2/configure.ac +++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/configure.ac | |||
@@ -799,7 +799,6 @@ cipher/Makefile | |||
799 | doc/Makefile | 799 | doc/Makefile |
800 | src/Makefile | 800 | src/Makefile |
801 | src/libgcrypt-config | 801 | src/libgcrypt-config |
802 | tests/Makefile | ||
803 | w32-dll/Makefile | 802 | w32-dll/Makefile |
804 | ]) | 803 | ]) |
805 | AC_OUTPUT | 804 | AC_OUTPUT |