From 12fd1376394c548d5fd40d45bacf12cc009aa62e Mon Sep 17 00:00:00 2001
From: Yun Liu <yun@yun.(none)>
Date: Tue, 25 Nov 2008 11:44:37 -0500
Subject: [PATCH] Patch for gcc4.3 and libtool2.2.4

---
 libs/utilspp/singleton/LifetimeLibrary.hpp       |  2 +-
 libs/utilspp/singleton/LifetimeWithLongevity.hpp |  2 +-
 src/audio/audiofile.cpp                          |  1 +
 src/audio/audioloop.cpp                          |  1 +
 src/audio/codecs/Makefile.am                     | 10 +++++-----
 src/audio/tone.cpp                               |  2 ++
 src/config/config.cpp                            |  1 +
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libs/utilspp/singleton/LifetimeLibrary.hpp b/libs/utilspp/singleton/LifetimeLibrary.hpp
index 80fba716ab..27f62ad750 100644
--- a/libs/utilspp/singleton/LifetimeLibrary.hpp
+++ b/libs/utilspp/singleton/LifetimeLibrary.hpp
@@ -25,7 +25,7 @@
 #define LIFETIME_LIBRARY_HPP
 
 #include <cassert>
-
+#include <algorithm> 
 #include "PrivateMembers.hpp"
 #include "CreationUsingNew.hpp"
 
diff --git a/libs/utilspp/singleton/LifetimeWithLongevity.hpp b/libs/utilspp/singleton/LifetimeWithLongevity.hpp
index 7683df3d9b..c7749d43f5 100644
--- a/libs/utilspp/singleton/LifetimeWithLongevity.hpp
+++ b/libs/utilspp/singleton/LifetimeWithLongevity.hpp
@@ -25,8 +25,8 @@
 #define LIFETIME_WITH_LONGEVITY_HPP
 
 #include <cassert>
-
 #include "PrivateMembers.hpp"
+#include <algorithm>
 
 namespace utilspp
 {
diff --git a/src/audio/audiofile.cpp b/src/audio/audiofile.cpp
index 2224e3e8f6..5d639f296f 100644
--- a/src/audio/audiofile.cpp
+++ b/src/audio/audiofile.cpp
@@ -25,6 +25,7 @@
 #include <fstream>
 #include <math.h>
 #include <samplerate.h>
+#include <cstring>
 
 AudioFile::AudioFile()
  : AudioLoop(),
diff --git a/src/audio/audioloop.cpp b/src/audio/audioloop.cpp
index 63bfefac4e..ecf85d1b03 100644
--- a/src/audio/audioloop.cpp
+++ b/src/audio/audioloop.cpp
@@ -22,6 +22,7 @@
  */
 #include "audioloop.h"
 #include <math.h>
+#include <strings.h>
 
 AudioLoop::AudioLoop():_buffer(0),  _size(0), _pos(0), _sampleRate(0) 
 {
diff --git a/src/audio/codecs/Makefile.am b/src/audio/codecs/Makefile.am
index e1bfcbd01a..0f790f478a 100644
--- a/src/audio/codecs/Makefile.am
+++ b/src/audio/codecs/Makefile.am
@@ -5,7 +5,7 @@ GSM_LIB = libcodec_gsm.so
 libcodec_gsm_so_SOURCES = gsmcodec.cpp
 libcodec_gsm_so_CFLAGS = -fPIC -g -Wall
 libcodec_gsm_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_gsm_so_LDFLAGS = -shared -lc -lgsm
+libcodec_gsm_so_LDFLAGS = --shared -lc -lgsm
 INSTALL_GSM_RULE = install-libcodec_gsm_so
 endif
 
@@ -14,7 +14,7 @@ SPEEX_LIB = libcodec_speex.so
 libcodec_speex_so_SOURCES = speexcodec.cpp
 libcodec_speex_so_CFLAGS = -fPIC -g -Wall
 libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_speex_so_LDFLAGS = -shared -lc -lspeex
+libcodec_speex_so_LDFLAGS = --shared -lc -lspeex
 INSTALL_SPEEX_RULE = install-libcodec_speex_so
 endif
 
@@ -23,7 +23,7 @@ ILBC_LIB = libcodec_ilbc.so
 libcodec_ilbc_so_SOURCES = ilbc.cpp
 libcodec_ilbc_so_CFLAGS = -fPIC -g -Wall
 libcodec_ilbc_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_ilbc_so_LDFLAGS = -shared ilbc/*.o -lc
+libcodec_ilbc_so_LDFLAGS = --shared ilbc/*.o -lc
 INSTALL_ILBC_RULE = install-libcodec_ilbc_so
 SUBDIRS = ilbc
 endif
@@ -35,12 +35,12 @@ noinst_HEADERS = audiocodec.h
 libcodec_ulaw_so_SOURCES = ulaw.cpp
 libcodec_ulaw_so_CFLAGS = -fPIC -g -Wall
 libcodec_ulaw_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_ulaw_so_LDFLAGS = -shared -lc
+libcodec_ulaw_so_LDFLAGS = --shared -lc
 
 libcodec_alaw_so_SOURCES = alaw.cpp
 libcodec_alaw_so_CFLAGS = -fPIC -g -Wall
 libcodec_alaw_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_alaw_so_LDFLAGS = -shared -lc
+libcodec_alaw_so_LDFLAGS = --shared -lc
 
 
 
diff --git a/src/audio/tone.cpp b/src/audio/tone.cpp
index 646dae56a5..91471942ae 100644
--- a/src/audio/tone.cpp
+++ b/src/audio/tone.cpp
@@ -25,6 +25,8 @@
  */
 #include "tone.h"
 #include <math.h>
+#include <cstdlib>
+#include <strings.h>
 
 Tone::Tone(const std::string& definition, unsigned int sampleRate) : AudioLoop(), _sampleRate(sampleRate)
 {
diff --git a/src/config/config.cpp b/src/config/config.cpp
index 700f70484e..c32ea17719 100644
--- a/src/config/config.cpp
+++ b/src/config/config.cpp
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "../global.h"
 #include <fstream>
+#include <cstdlib>
 
 namespace Conf {
 
-- 
GitLab