]>
Commit | Line | Data |
---|---|---|
0d2e460a AM |
1 | diff -urN commoncpp2-1.5.1.org/configure.ac commoncpp2-1.5.1/configure.ac |
2 | --- commoncpp2-1.5.1.org/configure.ac 2006-10-07 20:14:28.000000000 +0200 | |
3 | +++ commoncpp2-1.5.1/configure.ac 2006-11-10 11:48:05.995177250 +0100 | |
4 | @@ -354,6 +354,9 @@ | |
5 | darwin*) | |
6 | MODULE_FLAGS="-dynamic -bundle -undefined suppress -flat_namespace -read_only_relocs suppress" | |
7 | ;; | |
8 | +linux*) | |
9 | + BASE_LIB="$SSL_LIBS" | |
10 | + ;; | |
11 | esac | |
12 | ||
13 | AC_SUBST(COMMON_FLAGS) | |
14 | diff -urN commoncpp2-1.5.1.org/Makefile.am commoncpp2-1.5.1/Makefile.am | |
15 | --- commoncpp2-1.5.1.org/Makefile.am 2006-05-03 14:31:58.000000000 +0200 | |
16 | +++ commoncpp2-1.5.1/Makefile.am 2006-11-10 11:51:07.890545000 +0100 | |
17 | @@ -21,12 +21,8 @@ | |
18 | if WIN32 | |
19 | SUBDIRS = include src doc | |
20 | else | |
21 | -if MSWIN32 | |
22 | -SUBDIRS = include w32 doc | |
23 | -else | |
24 | SUBDIRS = include src doc | |
25 | endif | |
26 | -endif | |
27 | ||
28 | macosx: | |
29 | (cd src ; make macosx) | |
30 | @@ -34,23 +30,4 @@ | |
31 | darwin: | |
8b2affe5 KK |
32 | (cd src ; make macosx) |
33 | ||
0d2e460a | 34 | -install-data-local: |
8b2affe5 KK |
35 | - @if test -f /etc/ld.so.conf \ |
36 | - -a `echo $(libdir) | grep ^/usr`XXX != "XXX" ; then \ | |
37 | - if ! grep -q "$(libdir)" /etc/ld.so.conf; then \ | |
38 | - echo "------------------------------------------------------------------------------" ;\ | |
39 | - echo "Hmm, looks like you forgot to add $(libdir) to /etc/ld.so.conf." ;\ | |
40 | - echo "I'll try to fix it for you (but pay attention to libtool's output" ;\ | |
41 | - echo "next time, ok?)" ;\ | |
42 | - echo "$(libdir)" >> /etc/ld.so.conf && \ | |
43 | - echo "Ok, all fixed." \ | |
44 | - || \ | |
45 | - (echo "" ;\ | |
46 | - echo "Well, that didn't work. Remember to add $(libdir) to" ;\ | |
47 | - echo "/etc/ld.so.conf if you want to use this library.") ;\ | |
48 | - echo "------------------------------------------------------------------------------" ;\ | |
49 | - ldconfig ;\ | |
50 | - fi ;\ | |
51 | - fi | |
0d2e460a AM |
52 | - |
53 | ||
54 | diff -urN commoncpp2-1.5.1.org/src/Makefile.am commoncpp2-1.5.1/src/Makefile.am | |
55 | --- commoncpp2-1.5.1.org/src/Makefile.am 2006-09-30 18:41:53.000000000 +0200 | |
56 | +++ commoncpp2-1.5.1/src/Makefile.am 2006-11-10 12:11:29.986921250 +0100 | |
57 | @@ -32,8 +32,8 @@ | |
58 | scriptdir = $(bindir) | |
59 | script_DATA = ccgnu2-config | |
60 | ||
61 | -libccgnu2_la_LIBADD = @THREAD_LIBS@ | |
62 | -libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS) | |
63 | +libccgnu2_la_LIBADD = @THREAD_LIBS@ -lpthread -ldl | |
64 | +libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS) -lpthread | |
65 | noinst_DATA = @STAGE2@ | |
66 | ||
67 | libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \ | |
68 | @@ -45,7 +45,7 @@ | |
69 | cidr.cpp private.h nat.h | |
70 | ||
71 | if EXTRAS | |
72 | -libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ | |
4e09d7a4 | 73 | +libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ libccgnu2.la -lz |
0d2e460a AM |
74 | libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS) |
75 | ||
76 | if GETOPT_LONG | |
77 | @@ -64,6 +64,11 @@ | |
78 | tokenizer.cpp mime.cpp ssl.cpp | |
79 | ||
80 | endif | |
81 | + | |
82 | +else | |
83 | + | |
4e09d7a4 | 84 | +libccext2_la_LIBADD = libccgnu2.la -lz |
0d2e460a AM |
85 | + |
86 | endif | |
87 | ||
88 | # private.h and nat.h are internal headers |