Commit Graph

103 Commits

Author SHA1 Message Date
Uli Schlachter
013d0d2773 Drop @DEFS@ from the build system
This will only ever be set to -DHAVE_CONFIG_H. However, we shouldn't give this
flag to other people's code (e.g. through znc-config). Since we don't need it,
it's best to just drop it completely.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-09-02 18:21:50 +02:00
Kyle Fuller
e86ff3219d Fix module data for extra/ modules for real 2011-08-05 22:16:21 +01:00
Uli Schlachter
cb6798d36f Fix module data for extra/ modules
No module in extra/ comes with any data currently, so this was tested by moving
perform to extra/. The install is untested.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-08-05 15:19:09 +02:00
Alexey Sokolov
7d912d1d2d Check SWIG version in configure. 2011-05-06 15:17:30 +07:00
Alexey Sokolov
ba915eb9c4 Use pkg-config for modpython.
python3-config fails when python is installed not system-wide.
It doesn't return -L/path/to/libs.
pkg-config resurns it.

Note that this changes meaning of optional argument to ./configure --enable-python=...
2011-03-31 20:13:19 +07:00
Alexey Sokolov
076929bb50 Merge branch 'modulesdata'
Conflicts:
	modules/Makefile.in
2011-03-28 17:15:00 +07:00
Alexey Sokolov
9506d7e32b Fix copying modules data directories.
This fixes out-of-tree builds.
2011-03-06 20:50:22 +06:00
Alexey Sokolov
3a838d1493 Move module data files to own dir. 2011-03-06 12:32:14 +06:00
Alexey Sokolov
3d3235743d Fix permissions for modules's static data.
With cp -Rp, the files's permissions were just copied from source.
But 4c7808c5c broke that behaviour, so after copying we set permissions for new installed files.

Why "install" doesn't support installing directories? :(
2011-02-28 23:49:53 +06:00
Daniel Holbert
4c7808c5cb Remove unnecessary "-p" parameter from cp command in Makefiles, to fix checkinstall failure 2011-02-28 14:25:22 +13:00
Uli Schlachter
2dcf79cedc Move modtcl into modules/
If you did ./configure --enable-tcl, tcl wasn't actually enabled because
--enable-extra was missing, That's less than optimal.

Just moving modtcl out of modules/extra solves this problem.

Big thanks go to zynox/kylef for noticing this!

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-02-17 17:45:46 +01:00
psychon
3ecbf13390 Use autoheader
This commit adds a zncconfig.h to ZNC that is automatically generated by
configure. This is done because the -DPACKAGE_STRING=\"znc\ 0.097\" that
configure adds to CXXFLAGS breaks znc-buildmod.

This means that we have to include zncconfig.h as the very first header in every
C++ file that is compiled. This commit kinda cheats and instead adds this
include as the very first thing to all header files we have. This should
hopefully mean that modules don't have to include this.

Because Csocket includes defines.h too late, this commit causes znc to divert
from upstream Csocket once again. :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2250 726aef4b-f618-498e-8847-2d620e286838
2011-01-07 15:01:08 +00:00
psychon
8a1c2a4711 Include @DEFS@ into our compiler call
On most systems, this should only result in some useless defines being added to
the compiler's command line:

-DPACKAGE_NAME=\"znc\" -DPACKAGE_TARNAME=\"znc\" -DPACKAGE_VERSION=\"0.097\"
-DPACKAGE_STRING=\"znc\ 0.097\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\"

However, on some weird arches like e.g. x86, this will make AC_SYS_LARGEFILE
actually work, because that macro adds "-D_FILE_OFFSET_BITS=64" to @DEPS@.

This was found by SilverLeo because modpython didn't compile for him, thanks. :)
(python has "#define _FILE_OFFSET_BITS 64" in pyconfig.h)

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2242 726aef4b-f618-498e-8847-2d620e286838
2011-01-02 17:15:21 +00:00
darthgandalf
4be057200b Fix out-of-tree builds.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2223 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 22:40:24 +00:00
darthgandalf
afa16df2bc Fix make clean for modperl and modpython
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2220 726aef4b-f618-498e-8847-2d620e286838
2010-12-30 19:18:24 +00:00
darthgandalf
d2e5a2416c Fix disabling of modperl, modpython.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2210 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 19:29:44 +00:00
psychon
40632f46d0 Split up modules/Makefile.in
This splits the modpython, modperl and modtcl specific parts of
modules/Makefile.in into separate files. There shouldn't be any other changes
than this in here (hopefully).


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2209 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 18:30:11 +00:00
darthgandalf
517307b96a Remove verbosity from pyc files of Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2207 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 16:23:15 +00:00
darthgandalf
d21a1be74a Fix some dependencies of Makefile
Thanks for zynox for finding this

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2205 726aef4b-f618-498e-8847-2d620e286838
2010-12-24 15:30:19 +00:00
psychon
0cc8bebd2b Various fixes for our Makefiles
- Make sure webskins are installed with the correct permissions even though we
  don't use install for installing them.
- Make "make uninstall" use the correct path for webskins.
- Properly clean up the stuff generated by modperl and modpython on "make clean"
- Don't first install modperl/ and modpython/ only to remove them again later
- Use $(wildcard) to expand *.foo to the empty string if nothing matches.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2201 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 14:15:49 +00:00
darthgandalf
18234a9445 Fix ignoring of fails in Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2200 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 10:33:42 +00:00
psychon
936b434dbb Add some -Wno flags to modpython
This is now enough that it builds for me! :)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2199 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 10:24:35 +00:00
darthgandalf
aee8763c5d modpython/codegen.pl had wrong permissions
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2197 726aef4b-f618-498e-8847-2d620e286838
2010-12-23 01:35:56 +00:00
darthgandalf
a564e25c13 Add modpython module which allows to write ZNC modules on python3.
Notice for distro maintainers: perl interpreter is required to compile modpython.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2196 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:52:53 +00:00
darthgandalf
c7c0d1714c Change internal way of making Makefile to know if need to compile modperl or not.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2195 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:51:49 +00:00
darthgandalf
df34098eee Fix out-of-tree builds for modperl.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2193 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:50:59 +00:00
darthgandalf
0ad5cf8e71 Proper way of ignoring fails in Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2192 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:50:34 +00:00
darthgandalf
23d4cf9c6b This is bindings for Perl language, not for it's interpreter, so fix UI in Makefile.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2191 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:50:06 +00:00
darthgandalf
33e1cccc10 Add phoniness to phony makefile targets.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2190 726aef4b-f618-498e-8847-2d620e286838
2010-12-22 14:49:31 +00:00
darthgandalf
ced8aa82ed Don't fail make install if there're no perl modules in source dir.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2127 726aef4b-f618-498e-8847-2d620e286838
2010-09-10 20:34:24 +00:00
darthgandalf
20a9002953 Rename modperl/modperl_wrap.cxx to modperl/ZNC.cpp
This should make psychon happier :)

Also small fix in Makefile to make swig header in another task.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2123 726aef4b-f618-498e-8847-2d620e286838
2010-09-08 16:57:03 +00:00
psychon
992351b9d6 modperl: Move some common compiler flags to $(PERLCOMMON)
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2122 726aef4b-f618-498e-8847-2d620e286838
2010-09-08 15:57:05 +00:00
darthgandalf
a44e6eaada Big update of modperl module.
Old modperl had several flaws and was very outdated.
New modperl makes the whole ZNC API accessible from inside perl.
Modperl API was changed, so old perl modules are not supported,
but they weren't used much anyway.

Modperl needs --enable-perl option to ./configure.

This introduces new dependence on SWIG, which is needed only while
compiling ZNC. So to use modperl, you need to install SWIG or
to download several files and use --disable-swig option of configure.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2120 726aef4b-f618-498e-8847-2d620e286838
2010-09-07 11:13:47 +00:00
psychon
877c5775b7 Add 'make V=1'
This does the very same thing 'make VERBOSE=1' does.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2111 726aef4b-f618-498e-8847-2d620e286838
2010-08-23 17:51:40 +00:00
psychon
c91d032e6b Make make's output more readable
The real command line is now hidden and instead a short message which explains
what is done is displayed. To get back the old behavior, use "make VERBOSE=1".

Thanks to DarthGandalf for this.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2094 726aef4b-f618-498e-8847-2d620e286838
2010-08-03 10:01:36 +00:00
psychon
eb307ddc6f Use AC_PROG_INSTALL to find a usable install
Thanks to LeftWing aka Joshua M. Clulow. This patch is based on his work.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2067 726aef4b-f618-498e-8847-2d620e286838
2010-07-05 16:35:48 +00:00
psychon
84ae0f2edd Set $SHELL in Makefiles
$SHELL controls which shell is used for executing the commands in a Makefile.
Since modules/Makefile does not work with ksh, we need to find a "proper" shell.
Luckily, configure already did that job and announces its findings via @SHELL@.

This should make our Makefile work on Solaris.
Thanks to LeftWing aka Joshua M. Clulow.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2064 726aef4b-f618-498e-8847-2d620e286838
2010-07-05 15:54:03 +00:00
psychon
703a5e879f modules/Makefile: Don't try to install www/
That directory was removed in r1997 so trying to install it might be rather
tricky (in fact, it failed and caused 'make install' to abort).


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2000 726aef4b-f618-498e-8847-2d620e286838
2010-05-18 16:16:04 +00:00
psychon
fbe5dd10e7 Move module templates to DATADIR
The file hierarchy standard wants that!


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1982 726aef4b-f618-498e-8847-2d620e286838
2010-05-13 16:51:17 +00:00
cflakes
dee94a0bb8 Added the necessary checks for (lib)iconv in order to enable
the charset module from extra to do its thing. This has been
a pain in the ass and I'd like to thank psychon who made most
of the autofoo happen and BrianC for finding out that BSD sucks
and for testing! Yay!


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1947 726aef4b-f618-498e-8847-2d620e286838
2010-04-27 15:40:24 +00:00
psychon
16464664e8 Fail less badly if perl isn't found
After this, perl, c-ares and openssl now are handled similar if they aren't
found.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1895 726aef4b-f618-498e-8847-2d620e286838
2010-04-07 16:55:27 +00:00
prozacx
ad92c58c42 Initial commit of webmods - still lots of work to be done
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1784 726aef4b-f618-498e-8847-2d620e286838
2010-02-22 07:40:22 +00:00
psychon
2a14222ef5 Move saslauth into modules/extra/
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1626 726aef4b-f618-498e-8847-2d620e286838
2009-09-14 12:17:17 +00:00
psychon
868e5343c2 Remove an unnecessary include from modules/Makefile
All dependency files are creates in .depend, there is no .depend/extra subdir.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1619 726aef4b-f618-498e-8847-2d620e286838
2009-09-08 20:44:12 +00:00
psychon
495c196a82 Fix out-of-tree builds
Instead of using sed to strip away the source dir this now uses make's notdir.
$(notdir this/is/an/example) results in example.

This also moved the generated dependency files from .depend/extra into .depend/

Since we need the extra/ path prefix for the modules from modules/extra, that
one is added back via addprefix.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1610 726aef4b-f618-498e-8847-2d620e286838
2009-08-22 16:03:51 +00:00
psychon
61449c6f97 Import SilverLeo's modtcl from znc-extra
The configure and Makefile stuff was taken from there, too. By default modtcl is
disabled, use --enable-extra --enable-tcl to get it.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1609 726aef4b-f618-498e-8847-2d620e286838
2009-08-22 15:45:32 +00:00
psychon
a675e474e5 Whoops fix a minor makefile dependency error
modules/Makefile didn't include the dependency information for modules/extra/*


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1608 726aef4b-f618-498e-8847-2d620e286838
2009-08-20 21:12:44 +00:00
psychon
0b7576a474 Add support for extra modules
This commits adds the necessary build system fun for extra modules in
modules/extra which can be enabled with --enable-extra.

This is a preparation for the import of znc-extra.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1605 726aef4b-f618-498e-8847-2d620e286838
2009-08-20 19:49:21 +00:00
psychon
bec752077b Add "make uninstall" target
(And some minor fixes to "make install")


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1580 726aef4b-f618-498e-8847-2d620e286838
2009-07-26 15:04:59 +00:00
psychon
dfd95078dd modperl also needs -Wno-missing-declarations
Now ZNC compiles with -Wmissing-declarations :)
(BTW I hate the perl headers, could some fix them app so that they cause
less warnings?)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1499 726aef4b-f618-498e-8847-2d620e286838
2009-04-26 10:14:42 +00:00