commoncpp2-Makefile.patch

   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/src/Makefile.am commoncpp2-1.5.1/src/Makefile.am
  15 --- commoncpp2-1.5.1.org/src/Makefile.am        2006-09-30 18:41:53.000000000 +0200
  16 +++ commoncpp2-1.5.1/src/Makefile.am    2006-11-10 12:11:29.986921250 +0100
  17 @@ -32,8 +32,8 @@
  18  scriptdir = $(bindir)
  19  script_DATA = ccgnu2-config
  20
  21 -libccgnu2_la_LIBADD = @THREAD_LIBS@
  22 -libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
  23 +libccgnu2_la_LIBADD = @THREAD_LIBS@ -lpthread -ldl
  24 +libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS) -lpthread
  25  noinst_DATA = @STAGE2@
  26
  27  libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
  28 @@ -45,7 +45,7 @@
  29         cidr.cpp private.h nat.h
  30
  31  if EXTRAS
  32 -libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
  33 +libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ libccgnu2.la -lz
  34  libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
  35
  36  if GETOPT_LONG
  37 @@ -64,6 +64,11 @@
  38         tokenizer.cpp mime.cpp ssl.cpp
  39
  40  endif
  41 +
  42 +else
  43 +
  44 +libccext2_la_LIBADD = libccgnu2.la -lz
  45 +
  46  endif
  47
  48  # private.h and nat.h are internal headers