Extra stuff to improve buildsystem, calculate lib and include dirs at configure time rather than at build time. This means that we can also throw errors at configure time if we cant find the libraries,

rather than erroring at buildtime like we used to.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6306 e03df62e-2008-0410-955e-edbf42e46eb7

8 files changed, 5 insertions, 37 deletions

diff --git a/src/modules/extra/gnutls_rpath.pl b/src/modules/extra/gnutls_rpath.pl
deleted file mode 100644
index 3371d5c8a..000000000
--- a/src/modules/extra/gnutls_rpath.pl
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/perl
-$data = `libgnutls-config --libs`;
-$data =~ s/-L(\S+)\s/-Wl,--rpath -Wl,$1 -L$1 /g;
-print "$data";
diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 6d4964913..da0142317 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -22,7 +22,7 @@
 
 /* $ModDesc: m_filter with regexps */
 /* $CompileFlags: `pcre-config --cflags` */
-/* $LinkerFlags: `pcre-config --libs` `perl extra/pcre_rpath.pl` -lpcre */
+/* $LinkerFlags: `pcre-config --libs` rpath("pcre-config --libs") -lpcre */
 /* $ModDep: m_filter.h */
 
 class PCREFilter : public FilterResult
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index b0e6cfcc5..7b718b43a 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -25,7 +25,7 @@
 
 /* $ModDesc: SQL Service Provider module for all other m_sql* modules */
 /* $CompileFlags: `mysql_config --include` */
-/* $LinkerFlags: `mysql_config --libs_r` `perl extra/mysql_rpath.pl` */
+/* $LinkerFlags: `mysql_config --libs_r` rpath("mysql_config --libs_r") */
 /* $ModDep: m_sqlv2.h */
 
 /* THE NONBLOCKING MYSQL API!
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 808c748cc..bb76ec978 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -31,7 +31,7 @@
 
 /* $ModDesc: Provides SSL support for clients */
 /* $CompileFlags: `libgnutls-config --cflags` */
-/* $LinkerFlags: `perl extra/gnutls_rpath.pl` */
+/* $LinkerFlags: rpath("libgnutls-config --libs") */
 /* $ModDep: transport.h */
 
 
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index f46f04988..3398af91f 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -30,8 +30,8 @@
 #include "transport.h"
 
 /* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: `perl extra/openssl_config.pl compile` */
-/* $LinkerFlags: `perl extra/openssl_config.pl link` */
+/* $CompileFlags: pkgconfincludes("openssl","/openssl/ssl.h","") */
+/* $LinkerFlags: pkgconflibs("openssl","/libssl.so","-lssl -lcrypto") */
 /* $ModDep: transport.h */
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
diff --git a/src/modules/extra/mysql_rpath.pl b/src/modules/extra/mysql_rpath.pl
deleted file mode 100644
index b1ac57b5a..000000000
--- a/src/modules/extra/mysql_rpath.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../..";
-use make::utilities;
-
-print make_rpath("mysql_config --libs_r");
-
diff --git a/src/modules/extra/openssl_config.pl b/src/modules/extra/openssl_config.pl
deleted file mode 100644
index 7fa03dc89..000000000
--- a/src/modules/extra/openssl_config.pl
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../..";
-use make::utilities;
-
-if ($ARGV[0] eq "compile")
-{
-	print pkgconfig_get_include_dirs("openssl", "/openssl/ssl.h", ""); 
-}
-else
-{
-	print pkgconfig_get_lib_dirs("openssl", "/libssl.so", "-lssl -lcrypto");
-}
-
diff --git a/src/modules/extra/pcre_rpath.pl b/src/modules/extra/pcre_rpath.pl
deleted file mode 100644
index 00677895e..000000000
--- a/src/modules/extra/pcre_rpath.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../..";
-use make::utilities;
-
-print make_rpath("pcre-config --libs");
-