From da50d68ce9e3a0f7137a1ef202a089680c12745d Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 24 Mar 2010 10:48:51 -0400
Subject: [PATCH] Fix a compilation bug
---
sflphone-client-kde/cmake/FindKabc.cmake | 2 +-
sflphone-common/libs/pjproject/build/os-auto.mak | 2 +-
sflphone-common/libs/pjproject/config.guess | 2 +-
sflphone-common/libs/pjproject/config.sub | 2 +-
sflphone-common/libs/pjproject/pjlib/build/os-auto.mak | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sflphone-client-kde/cmake/FindKabc.cmake b/sflphone-client-kde/cmake/FindKabc.cmake
index 59405f2f71..ab3431d110 100644
--- a/sflphone-client-kde/cmake/FindKabc.cmake
+++ b/sflphone-client-kde/cmake/FindKabc.cmake
@@ -1,5 +1,5 @@
FIND_LIBRARY(KABC_LIBRARY NAMES kabc)
-FIND_PATH(KABC_INCLUDE_DIR kabc_export.h /usr/include/kabc /usr/local/include/kabc )
+FIND_PATH(KABC_INCLUDE_DIR kabc_export.h /usr/include/kabc /usr/local/include/kabc $ENV{KDEDIR}/include/kabc )
IF (KABC_INCLUDE_DIR AND KABC_LIBRARY)
diff --git a/sflphone-common/libs/pjproject/build/os-auto.mak b/sflphone-common/libs/pjproject/build/os-auto.mak
index 6fa43bda1b..62fa86b5c3 100644
--- a/sflphone-common/libs/pjproject/build/os-auto.mak
+++ b/sflphone-common/libs/pjproject/build/os-auto.mak
@@ -4,7 +4,7 @@ export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2
export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2
-export OS_LDFLAGS := -lm -luuid -lnsl -lrt -lpthread -lasound -lssl -lcrypto
+export OS_LDFLAGS := -lm -lnsl -lrt -lpthread -lasound -lssl -lcrypto
export OS_SOURCES :=
diff --git a/sflphone-common/libs/pjproject/config.guess b/sflphone-common/libs/pjproject/config.guess
index f42b0a5a40..e019d6cb60 120000
--- a/sflphone-common/libs/pjproject/config.guess
+++ b/sflphone-common/libs/pjproject/config.guess
@@ -1 +1 @@
-/usr/share/misc/config.guess
\ No newline at end of file
+/usr/lib/rpm/config.guess
\ No newline at end of file
diff --git a/sflphone-common/libs/pjproject/config.sub b/sflphone-common/libs/pjproject/config.sub
index 04fd6e297d..a7d52c6354 120000
--- a/sflphone-common/libs/pjproject/config.sub
+++ b/sflphone-common/libs/pjproject/config.sub
@@ -1 +1 @@
-/usr/share/misc/config.sub
\ No newline at end of file
+/usr/lib/rpm/config.sub
\ No newline at end of file
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak b/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
index fc6b33eb28..7439bddaec 100644
--- a/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
+++ b/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
@@ -1,7 +1,7 @@
# pjlib/build/os-auto.mak. Generated from os-auto.mak.in by configure.
# Determine OS specific files
-AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o
+AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o
#
# PJLIB_OBJS specified here are object files to be included in PJLIB
@@ -23,7 +23,7 @@ export TEST_OBJS += main.o
#
# Additional LDFLAGS for pjlib-test
#
-export TEST_LDFLAGS += -lm -luuid -lnsl -lrt -lpthread -lasound -lssl -lcrypto
+export TEST_LDFLAGS += -lm -lnsl -lrt -lpthread -lasound -lssl -lcrypto
#
# TARGETS are make targets in the Makefile, to be executed for this given
--
GitLab