- one more

[packages/irssi.git] / irssi-dynamic.patch

diff --git a/irssi-dynamic.patch b/irssi-dynamic.patch
index 08cff097b001ac7d47475af7d39a8cfab6285a86..1186692ba4e1dfaa58f4e702286c1ca5ab971e4b 100644 (file)
--- a/irssi-dynamic.patch
+++ b/irssi-dynamic.patch
@@ -12,22 +12,13 @@ diff -ur irssi-0.8.10-rc5-o/configure.in irssi-0.8.10-rc5/configure.in
  
  AC_CHECK_FUNCS(mkfifo fcntl nl_langinfo)
  
-@@ -351,7 +355,7 @@
-     AC_MSG_RESULT([yes, using it])
- 
-     dnl * we have to do this at this point so we know what libs gmodule needs
--    if test ! -f $GLIB_DIR/.libs/libglib.a; then
-+    if test ! -f $GLIB_DIR/.libs/libglib.la; then
-       echo
-       echo "configuring GLib ..."
-       echo
-@@ -745,21 +749,21 @@
+@@ -508,20 +508,20 @@
                        dnl * building with static perl support
                        dnl * all PERL_LDFLAGS linking is done in fe-text
                        PERL_LINK_FLAGS="$PERL_LDFLAGS"
 -                      PERL_LINK_LIBS="../perl/libperl_core_static.la"
 -                      PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la"
-+                      PERL_LINK_LIBS="../perl/libirssi_perl_core_static.la"
++                      PERL_LINK_LIBS="../perl/libirssiperl_core_static.la"
 +                      PERL_FE_LINK_LIBS="../perl/libirssife_perl_static.la"
                        PERL_LDFLAGS=
                        AC_DEFINE(HAVE_STATIC_PERL)
@@ -37,24 +28,23 @@ diff -ur irssi-0.8.10-rc5-o/configure.in irssi-0.8.10-rc5/configure.in
                        perl_module_fe_lib=
 -                      perl_static_lib=libperl_core_static.la
 -                      perl_static_fe_lib=libfe_perl_static.la
-+                      perl_static_lib=libirssi_perl_core_static.la
++                      perl_static_lib=libirssiperl_core_static.la
 +                      perl_static_fe_lib=libirssife_perl_static.la
-                       PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
                else
                        dnl * build dynamic library of perl module
 -                      perl_module_lib=libperl_core.la
 -                      perl_module_fe_lib=libfe_perl.la
-+                      perl_module_lib=libirssi_perl_core.la
++                      perl_module_lib=libirssiperl_core.la
 +                      perl_module_fe_lib=libirssife_perl.la
                        perl_static_lib=
                        perl_static_fe_lib=
-                       PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -833,7 +837,7 @@
+               fi
+@@ -591,7 +591,7 @@
  AC_SUBST(CHAT_MODULES)
  AC_SUBST(irc_MODULES)
  
--CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a ../lib-popt/libpopt.a"
-+CORE_LIBS="../core/libirssi_core.la ../lib-config/libirssi_config.la"
+-CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a"
++CORE_LIBS="../core/libirssicore.a ../lib-config/libirssi_config.a"
  FE_COMMON_LIBS=""
  
  CHAT_LIBS=""
@@ -95,7 +85,7 @@ diff -ur irssi-0.8.10-rc5-o/src/core/Makefile.am irssi-0.8.10-rc5/src/core/Makef
 -noinst_LIBRARIES = libcore.a
 +libirssi_core_LTLIBRARIES = libirssi_core.la
 +
-+libirssi_coredir = /usr/lib
++libirssi_coredir = $(libdir)
  
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -124,9 +114,9 @@ diff -ur irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am irssi-0.8.10-rc5/src/
  
 -libfe_common_core_a_SOURCES = \
 +libirssife_common_core_la_SOURCES = \
-       autorun.c \
        chat-completion.c \
        command-history.c \
+       completion.c \
 diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am
 --- irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am       2004-05-10 14:45:03.000000000 -0600
 +++ irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600
@@ -284,7 +274,7 @@ diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib-
 @@ -1,10 +1,11 @@
 -noinst_LIBRARIES = libirssi_config.a
 +libirssi_config_LTLIBRARIES = libirssi_config.la
-+libirssi_configdir = /usr/lib
++libirssi_configdir = $(libdir)
  
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -295,9 +285,8 @@ diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib-
        get.c \
        set.c \
        parse.c \
-diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makefile.am
---- irssi-0.8.10-rc5-o/src/perl/Makefile.am    2003-11-16 11:30:02.000000000 -0700
-+++ irssi-0.8.10-rc5/src/perl/Makefile.am      2005-05-29 01:33:18.000000000 -0600
+--- irssi-0.8.10/src/perl/Makefile.am~ 2005-12-11 17:10:06.000000000 +0200
++++ irssi-0.8.10/src/perl/Makefile.am  2005-12-11 17:12:01.000000000 +0200
 @@ -7,11 +7,11 @@
  module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib)
  noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib)
@@ -307,22 +296,16 @@ diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makef
 +      libirssi_perl_core.la libirssife_perl.la \
 +      libirssi_perl_core_static.la libirssife_perl_static.la
  
--libperl_core_la_LDFLAGS = -avoid-version -rpath $(moduledir)
--libfe_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir)
-+libirssi_perl_core_la_LDFLAGS = -avoid-version -rpath $(moduledir)
-+libirssife_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir)
+-libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
+-libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
++libirssi_perl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
++libirssife_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
  
  perl-core.c: perl-signals-list.h irssi-core.pl.h
  
-@@ -44,7 +44,7 @@
-       perl-signals.h \
-       perl-sources.h
- 
--libperl_core_la_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a
-+libirssi_perl_core_la_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a
- 
- .libs/libperl_orig.a:
-       if [ ! -d .libs ]; then mkdir .libs; fi
+diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makefile.am
+--- irssi-0.8.10-rc5-o/src/perl/Makefile.am    2003-11-16 11:30:02.000000000 -0700
++++ irssi-0.8.10-rc5/src/perl/Makefile.am      2005-05-29 01:33:18.000000000 -0600
 @@ -55,16 +55,16 @@
        rm -f .libs/DynaLoader.a
        $(LN_S) $(DYNALOADER_A) .libs/DynaLoader.a