diff options
| author | pem@mysql.com <> | 2005-11-28 20:14:12 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2005-11-28 20:14:12 +0100 |
| commit | b2a9961abfb6b67ced064f5f1cab416e9b04ddce (patch) | |
| tree | 0ba4502a6a4c3cdf74957b0ba578ccf99236f07b /extra | |
| parent | c171f8c6c64a57f391ffe64beb75fe554d096c2c (diff) | |
| parent | ba8d1f134ad70e715af9ea3da4a98a62de2d5d9b (diff) | |
| download | mariadb-git-b2a9961abfb6b67ced064f5f1cab416e9b04ddce.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/mysql-5.1-new
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/innochecksum.c | 2 | ||||
| -rw-r--r-- | extra/yassl/src/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 12 |
3 files changed, 8 insertions, 10 deletions
diff --git a/extra/innochecksum.c b/extra/innochecksum.c index 739953298af..bae5f3e8821 100644 --- a/extra/innochecksum.c +++ b/extra/innochecksum.c @@ -28,6 +28,8 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#define _XOPEN_SOURCE /* needed to include getopt.h on some platforms. */ + #include <stdio.h> #include <stdlib.h> #include <time.h> diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index df96018e1cf..a852ca4019b 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I../include -I../taocrypt/include -I../mySTL -noinst_LIBRARIES = libyassl.a -libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ +noinst_LTLIBRARIES = libyassl.la +libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \ template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h) diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index 0319fc6057b..d89fa95a940 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -1,15 +1,11 @@ INCLUDES = -I../include -I../../mySTL -noinst_LIBRARIES = libtaoint.a libtaocrypt.a +noinst_LTLIBRARIES = libtaocrypt.la -libtaoint_a_SOURCES = integer.cpp -libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@ - -libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ +libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \ md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \ - template_instnt.cpp -libtaocrypt_a_LIBADD = libtaoint_a-integer.o + template_instnt.cpp integer.cpp +libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C EXTRA_DIST = $(wildcard ../include/*.hpp) -AM_CXXFLAGS = -DYASSL_PURE_C |