diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-08-27 22:40:08 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-08-27 22:40:08 +0000 |
| commit | af59f544921a49b9984dd591077dc1ade106c567 (patch) | |
| tree | 05e741e189c3b39ab608dc0a5605c7ed235d1d3d | |
| parent | e395e87dedd9aa85f05e5c74330a76f1ef700371 (diff) | |
| download | irssi-af59f544921a49b9984dd591077dc1ade106c567.zip | |
updated
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@633 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | configure.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 821c9c4e..6a32d66b 100644 --- a/configure.in +++ b/configure.in @@ -278,13 +278,13 @@ dnl **************************************** AC_SUBST(CHAT_MODULES) AC_SUBST(irc_MODULES) -CORE_LIBS="../core/libcore.la ../lib-config/libirssi_config.la ../lib-popt/libpopt.la" +CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a ../lib-popt/libpopt.a" if test "$want_perl" = "yes"; then - PERL_LIBS="../perl/libperl.la" + PERL_LIBS="../perl/libperl.a" else PERL_LIBS="" fi -FE_COMMON_LIBS="../fe-common/core/libfe_common_core.la" +FE_COMMON_LIBS="../fe-common/core/libfe_common_core.a" CHAT_LIBS="" for c in $CHAT_MODULES; do @@ -292,9 +292,9 @@ for c in $CHAT_MODULES; do module_deinits="" fe_module_inits="" fe_module_deinits="" - CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.la ../$c/core/lib${c}_core.la" + CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a" if test -d $srcdir/src/fe-common/$c; then - FE_COMMON_LIBS="$FE_COMMON_LIBS ../fe-common/$c/libfe_common_$c.la" + FE_COMMON_LIBS="$FE_COMMON_LIBS ../fe-common/$c/libfe_common_$c.a" fi for s in `eval echo \\$${c}_MODULES`; do CHAT_LIBS="$CHAT_LIBS ../$c/$s/.libs/lib${c}_$s.a" @@ -320,8 +320,10 @@ for c in $CHAT_MODULES; do if test -d $srcdir/src/fe-common/$c; then file="$srcdir/src/fe-common/$c/${c}-modules.c" echo "/* this file is automatically generated by configure - don't change */" > $file - echo "$fe_module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file - echo "$fe_module_deinits" | $sedpath -e 's/[ ]*$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file + if test "x$fe_module_inits" != "x"; then + echo "$fe_module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file + echo "$fe_module_deinits" | $sedpath -e 's/[ ]*$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file + fi echo "void fe_${c}_modules_init(void) { $fe_module_inits }" >> $file echo "void fe_${c}_modules_deinit(void) { $fe_module_deinits }" >> $file fi |