summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ConfigureChecks.cmake15
-rw-r--r--config.h.cmake2
-rw-r--r--kopete/protocols/configure.in.in2
-rw-r--r--kopete/protocols/sms/serviceloader.cpp6
-rw-r--r--kopete/protocols/sms/services/CMakeLists.txt7
-rw-r--r--kopete/protocols/sms/services/ConfigureChecks.cmake28
-rw-r--r--kopete/protocols/sms/services/gsmlib.cpp3
-rw-r--r--kopete/protocols/sms/services/gsmlib.h2
-rw-r--r--kopete/protocols/sms/services/kopete_unix_serial.cpp3
-rw-r--r--kopete/protocols/sms/services/kopete_unix_serial.h2
10 files changed, 24 insertions, 46 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 4d5ad07a..dba12e86 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -46,5 +46,20 @@ if( WITH_SLP )
endif( )
endif( )
+if( BUILD_KOPETE AND BUILD_KOPETE_PROTOCOL_SMS AND WITH_GSM )
+ check_include_file_cxx( gsmlib/gsm_util.h HAVE_GSMLIB_GSM_UTIL_H )
+
+ if( HAVE_GSMLIB_GSM_UTIL_H )
+ find_library( GSM_LIBRARY gsmme )
+ endif( )
+
+ if( HAVE_GSMLIB_GSM_UTIL_H AND GSM_LIBRARY )
+ set( HAVE_GSMLIB 1 )
+ else( )
+ tde_message_fatal( "gsmlib is required, but was not found on your system" )
+ endif( )
+endif( )
+
+
check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
diff --git a/config.h.cmake b/config.h.cmake
index 8247d6e2..5b310852 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -34,7 +34,7 @@
#cmakedefine HAVE_XMMS 1
// kopete/protocols/sms
-#cmakedefine INCLUDE_SMSGSM 1
+#cmakedefine HAVE_GSMLIB 1
// kopete/plugins/webpresence
#cmakedefine HAVE_XSLT 1
diff --git a/kopete/protocols/configure.in.in b/kopete/protocols/configure.in.in
index 7a96cc9a..0e201dc7 100644
--- a/kopete/protocols/configure.in.in
+++ b/kopete/protocols/configure.in.in
@@ -157,5 +157,5 @@ AC_MSG_RESULT($compile_smsgsm)
AM_CONDITIONAL(include_smsgsm, [test "x$compile_smsgsm" = "xyes"])
if test "x$compile_smsgsm" = "xyes"; then
- AC_DEFINE(INCLUDE_SMSGSM, 1, [Define to compile with GSM SMS support])
+ AC_DEFINE(HAVE_GSMLIB, 1, [Define to compile with GSM SMS support])
fi
diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp
index d242e300..0e2c60a8 100644
--- a/kopete/protocols/sms/serviceloader.cpp
+++ b/kopete/protocols/sms/serviceloader.cpp
@@ -23,7 +23,7 @@
#include "serviceloader.h"
#include "smssend.h"
#include "smsclient.h"
-#ifdef INCLUDE_SMSGSM
+#ifdef HAVE_GSMLIB
# include "gsmlib.h"
#endif
#include "kopeteuiglobal.h"
@@ -37,7 +37,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac
s = new SMSSend(account);
else if (name == "SMSClient")
s = new SMSClient(account);
-#ifdef INCLUDE_SMSGSM
+#ifdef HAVE_GSMLIB
else if (name == "GSMLib")
s = new GSMLib(account);
#endif
@@ -56,7 +56,7 @@ TQStringList ServiceLoader::services()
TQStringList toReturn;
toReturn.append("SMSSend");
toReturn.append("SMSClient");
-#ifdef INCLUDE_SMSGSM
+#ifdef HAVE_GSMLIB
toReturn.append("GSMLib");
#endif
return toReturn;
diff --git a/kopete/protocols/sms/services/CMakeLists.txt b/kopete/protocols/sms/services/CMakeLists.txt
index c9942bd6..af047eb0 100644
--- a/kopete/protocols/sms/services/CMakeLists.txt
+++ b/kopete/protocols/sms/services/CMakeLists.txt
@@ -11,8 +11,6 @@
# FIXME KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-include( ConfigureChecks.cmake )
-
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
@@ -21,12 +19,15 @@ include_directories(
${TQT_INCLUDE_DIRS}
)
+if( WITH_GSM )
+ set( GSM_SOURCES gsmlib.cpp gsmlibprefs.ui kopete_unix_serial.cpp )
+endif( )
##### kopetesmsservices (static) ################
tde_add_library( kopetesmsservices STATIC_PIC AUTOMOC
SOURCES
smssend.cpp smssendprefs.ui smssendprovider.cpp smsclient.cpp
- smsclientprefs.ui gsmlib.cpp gsmlibprefs.ui kopete_unix_serial.cpp
+ smsclientprefs.ui ${GSM_SOURCES}
LINK ${GSM_LIBRARY}
)
diff --git a/kopete/protocols/sms/services/ConfigureChecks.cmake b/kopete/protocols/sms/services/ConfigureChecks.cmake
deleted file mode 100644
index 71f85d45..00000000
--- a/kopete/protocols/sms/services/ConfigureChecks.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-if( WITH_GSM )
-
- tde_save( CMAKE_REQUIRED_INCLUDES )
- set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
- check_include_file_cxx( gsmlib/gsm_util.h HAVE_GSMLIB_GSM_UTIL_H )
- tde_restore( CMAKE_REQUIRED_INCLUDES )
-
- if( HAVE_GSMLIB_GSM_UTIL_H )
- set( INCLUDE_SMSGSM 1 CACHE INTERNAL "" FORCE )
- find_library( GSM_LIBRARY gsmme )
- endif( )
-
- if( NOT (HAVE_GSMLIB_GSM_UTIL_H AND GSM_LIBRARY) )
- tde_message_fatal( "gsmlib is required, but was not found on your system" )
- endif( )
-
-endif( )
diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index d1d1e695..f8dcc1e3 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -13,7 +13,6 @@
*************************************************************************
*/
#include "config.h"
-#ifdef INCLUDE_SMSGSM
#include <tqcombobox.h>
#include <tqlayout.h>
@@ -449,5 +448,3 @@ const TQString& GSMLib::description()
}
#include "gsmlib.moc"
-
-#endif
diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h
index aa1bea5f..608c1f4c 100644
--- a/kopete/protocols/sms/services/gsmlib.h
+++ b/kopete/protocols/sms/services/gsmlib.h
@@ -17,7 +17,6 @@
#define GSMLIB_H_039562406
#include "config.h"
-#ifdef INCLUDE_SMSGSM
#include <unistd.h>
@@ -148,5 +147,4 @@ protected:
TQMutex m_outMessagesMutex;
};
-#endif
#endif //GSMLIB_H_039562406
diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp
index b66b0861..84dfd839 100644
--- a/kopete/protocols/sms/services/kopete_unix_serial.cpp
+++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp
@@ -11,7 +11,6 @@
// * Created: 10.5.1999
// *************************************************************************
#include "config.h"
-#ifdef INCLUDE_SMSGSM
#include <gsmlib/gsm_util.h>
#include <termios.h>
@@ -439,5 +438,3 @@ KopeteUnixSerialPort::~KopeteUnixSerialPort()
}
#include "kopete_unix_serial.moc"
-
-#endif
diff --git a/kopete/protocols/sms/services/kopete_unix_serial.h b/kopete/protocols/sms/services/kopete_unix_serial.h
index 98cc6854..9da7a9ce 100644
--- a/kopete/protocols/sms/services/kopete_unix_serial.h
+++ b/kopete/protocols/sms/services/kopete_unix_serial.h
@@ -15,7 +15,6 @@
#define GSM_UNIX_SERIAL_KOPETE_H
#include "config.h"
-#ifdef INCLUDE_SMSGSM
#include <string>
#include <gsmlib/gsm_error.h>
@@ -65,5 +64,4 @@ signals:
};
}
-#endif
#endif // GSM_UNIX_SERIAL_KOPETE_H
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-06 23:05:22 +0000