summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-10-11 21:22:00 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-10-11 21:22:00 +0000
commit23feae957d2f62d63f42ee6bb67af0d7c2c2db8d (patch)
tree186e569a5b7dc163f5f9d723042fa62d6bb88e0b
parentaa46dbe05865d97cb3b876694c5b6a28cecccab7 (diff)
Merge in nenolod's unified build patch from bug #413, thanks
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8147 e03df62e-2008-0410-955e-edbf42e46eb7
-rwxr-xr-xconfigure29
1 files changed, 16 insertions, 13 deletions
diff --git a/configure b/configure
index e3c460496..7897aec2d 100755
--- a/configure
+++ b/configure
@@ -1230,6 +1230,21 @@ sub write_dynamic_modules_makefile {
all: \$(MODULES)
EOF
+
+if ($config{OSNAME} =~ /darwin/) {
+ print FILEHANDLE <<EOCHEESE;
+
+PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle
+
+EOCHEESE
+} else {
+ print FILEHANDLE <<EOCHEESE;
+
+PICLDFLAGS = -fPIC -DPIC -shared \$(FLAGS)
+
+EOCHEESE
+}
+
###
# End Module Makefile Header
###
@@ -1252,20 +1267,8 @@ EOF
print FILEHANDLE <<EOCHEESE;
m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
- \$(CC) -pipe -I../../include \$(FLAGS) $cmflags -export-dynamic -c m_$i.cpp
-EOCHEESE
-
-if ($config{OSNAME} =~ /darwin/) {
- print FILEHANDLE <<EOCHEESE;
- \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle $liflags -o m_$i.so m_$i.o
-
+ \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
EOCHEESE
-} else {
- print FILEHANDLE <<EOCHEESE;
- \$(CC) -pipe \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o
-
-EOCHEESE
-}
$crud = $crud . " install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
###
# End Write Entry to the MakeFile