diff options
author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-13 23:53:08 +0000 |
---|---|---|
committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-13 23:53:08 +0000 |
commit | 4f0e6377e80d61ba633588568640881f6ddca9ec (patch) | |
tree | 8e7e214a27cd4de83f0b292d3442db7e96745406 /configure | |
parent | ad4d207905fa3ae5cec09163d7ac462e3120ad4b (diff) |
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
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -18,6 +18,9 @@ use Socket; use Cwd; use Getopt::Long; +# Utility functions for our buildsystem +use make::utilities; + GetOptions ( 'enable-gnutls' => \$opt_use_gnutls, 'enable-openssl' => \$opt_use_openssl, @@ -264,7 +267,7 @@ if ($config{GCCVER} eq "") { # Minihack! Convert Cygwin to 'Cyg-Static' so i can # Keep my dynamic module experiments here for later -# concideration! +# consideration! if ($config{OSNAME} =~ /CYGWIN/i) { @@ -1372,8 +1375,8 @@ sub getcompilerflags { open(FLAGS, $file); while (<FLAGS>) { if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { - close(FLAGS); - return $1; + close(FLAGS); + return translate_functions($1); } } close(FLAGS); @@ -1386,7 +1389,7 @@ sub getlinkerflags { while (<FLAGS>) { if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { close(FLAGS); - return $1; + return translate_functions($1); } } close(FLAGS); @@ -1399,7 +1402,7 @@ sub getdependencies { while (<FLAGS>) { if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { close(FLAGS); - return $1; + return translate_functions($1); } } close(FLAGS); |