mirror of
https://github.com/irssi/irssi.git
synced 2024-10-27 05:20:20 -04:00
don't simply check for module directory, check for dir/module.h file.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1448 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
08d578e6a5
commit
a147dfc90c
@ -614,14 +614,14 @@ for c in $CHAT_MODULES; do
|
|||||||
fe_module_inits=""
|
fe_module_inits=""
|
||||||
fe_module_deinits=""
|
fe_module_deinits=""
|
||||||
CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a"
|
CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a"
|
||||||
if test -d $srcdir/src/fe-common/$c; then
|
if test -f $srcdir/src/fe-common/$c/module.h; then
|
||||||
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a "
|
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a "
|
||||||
fi
|
fi
|
||||||
for s in `eval echo \\$${c}_MODULES`; do
|
for s in `eval echo \\$${c}_MODULES`; do
|
||||||
CHAT_LIBS="$CHAT_LIBS ../$c/$s/.libs/lib${c}_$s.a"
|
CHAT_LIBS="$CHAT_LIBS ../$c/$s/.libs/lib${c}_$s.a"
|
||||||
module_inits="$module_inits ${c}_${s}_init();"
|
module_inits="$module_inits ${c}_${s}_init();"
|
||||||
module_deinits="${c}_${s}_deinit(); $module_deinits"
|
module_deinits="${c}_${s}_deinit(); $module_deinits"
|
||||||
if test -d $srcdir/src/fe-common/$c/$s; then
|
if test -f $srcdir/src/fe-common/$c/$s/module.h; then
|
||||||
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/.libs/libfe_${c}_$s.a "
|
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/.libs/libfe_${c}_$s.a "
|
||||||
fe_module_inits="$fe_module_inits fe_${c}_${s}_init();"
|
fe_module_inits="$fe_module_inits fe_${c}_${s}_init();"
|
||||||
fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits"
|
fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits"
|
||||||
@ -638,7 +638,7 @@ for c in $CHAT_MODULES; do
|
|||||||
echo "void ${c}_init(void) { ${c}_core_init(); $module_inits }" >> $file
|
echo "void ${c}_init(void) { ${c}_core_init(); $module_inits }" >> $file
|
||||||
echo "void ${c}_deinit(void) { $module_deinits ${c}_core_deinit(); }" >> $file
|
echo "void ${c}_deinit(void) { $module_deinits ${c}_core_deinit(); }" >> $file
|
||||||
|
|
||||||
if test -d $srcdir/src/fe-common/$c; then
|
if test -f $srcdir/src/fe-common/$c/module.h; then
|
||||||
file="$srcdir/src/fe-common/$c/${c}-modules.c"
|
file="$srcdir/src/fe-common/$c/${c}-modules.c"
|
||||||
echo "/* this file is automatically generated by configure - don't change */" > $file
|
echo "/* this file is automatically generated by configure - don't change */" > $file
|
||||||
if test "x$fe_module_inits" != "x"; then
|
if test "x$fe_module_inits" != "x"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user