Changes in / [55758dc:8a22ff2]
- Files:
-
- 3 added
- 4 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.am
r3624a2c r353719a 12 12 13 13 check_PROGRAMS = tester.bin 14 dist_check_DATA = t15 dist_check_SCRIPTS = runtests.sh16 17 bin_SCRIPTS = barnowl18 check_SCRIPTS = tester19 20 barnowl tester: %: barnowl-wrapper.in %.bin Makefile21 sed \22 -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \23 -e 's,[@]abs_builddir[@],$(abs_builddir),g' \24 $< > $@25 chmod +x $@26 14 27 15 barnowl_bin_SOURCES = $(BASE_SRCS) \ 28 owl.h owl_perl.h \29 owl.c 30 nodist_barnowl_bin_SOURCES =$(GEN_C) $(GEN_H)16 owl.h owl_perl.h config.h \ 17 owl.c \ 18 $(GEN_C) $(GEN_H) 31 19 32 dist_man_MANS = doc/barnowl.133 d ist_doc_DATA = doc/intro.txt doc/advanced.txt20 man_MANS = doc/barnowl.1 21 doc_DATA = doc/intro.txt doc/advanced.txt 34 22 35 23 barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a 36 24 37 25 tester_bin_SOURCES = $(BASE_SRCS) \ 38 owl.h owl_perl.h \ 26 owl.h owl_perl.h config.h \ 27 $(GEN_C) $(GEN_H) \ 39 28 tester.c 40 nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)41 29 42 30 tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a … … 44 32 TESTS=runtests.sh 45 33 46 AM_CPPFLAGS = \34 AM_CPPFLAGS = -I$(top_srcdir)/ \ 47 35 -I$(top_srcdir)/libfaim/ \ 48 36 -DDATADIR='"$(pkgdatadir)"' \ … … 60 48 mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c 61 49 62 NORMAL_SRCS = filterproc.c filterproc.h window.c window.hwindowcb.c50 NORMAL_SRCS = filterproc.c window.c windowcb.c 63 51 64 52 BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS) 65 53 66 54 GEN_C = varstubs.c perlglue.c gmarshal_funcs.c 67 GEN_H = owl_prototypes.h owl_prototypes.h.newgmarshal_funcs.h55 GEN_H = owl_prototypes.h gmarshal_funcs.h 68 56 69 57 BUILT_SOURCES = $(GEN_C) $(GEN_H) … … 78 66 proto: owl_prototypes.h 79 67 80 perlglue.c: perlglue.xs typemap81 $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes $< > $@68 perlglue.c: perlglue.xs $(TYPEMAP) 69 $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c 82 70 83 71 varstubs.c: stubgen.pl variable.c … … 96 84 $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES) 97 85 86 install-data-local: 87 $(mkinstalldirs) ${DESTDIR}${pkgdatadir}/lib 88 (cd perl/lib && tar -cf - . ) | (cd ${DESTDIR}${pkgdatadir}/lib && tar -xf - ) 89 98 90 do_transform = $(shell echo '$(1)' | sed '$(transform)') 99 91 install-exec-hook: … … 101 93 $(DESTDIR)$(bindir)/$(call do_transform,barnowl) 102 94 103 uninstall-local:104 rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)105 106 CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)107 EXTRA_DIST = \108 autogen.sh \109 barnowl-wrapper.in \110 codelist.pl \111 doc \112 examples \113 marshal_types \114 perlglue.xs \115 scripts \116 stubgen.pl \117 typemap118 119 95 SUBDIRS = compat libfaim perl -
compat/Makefile.am
rb80bae0 r12a6616 1 1 noinst_LIBRARIES = libcompat.a 2 2 3 libcompat_a_SOURCES = compat.h3 libcompat_a_SOURCES = 4 4 libcompat_a_LIBADD = $(LIBOBJS) -
compat/compat.h
r6249a88f r4dde585 2 2 #define INC_BARNOWL_COMPAT_COMPAT_H 3 3 4 #include <config.h>4 #include "../config.h" 5 5 6 6 #include <stddef.h> -
configure.ac
reb5e8fc r06e04a9 100 100 dnl Find the location of perl XSUBPP 101 101 AC_MSG_CHECKING(for the perl xsubpp precompiler) 102 XSUBPPDIR="` cd "$srcdir" && perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;'| grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"102 XSUBPPDIR="`(perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;') | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`" 103 103 if test -n "${XSUBPPDIR}"; then 104 104 AC_MSG_RESULT(${XSUBPPDIR}) -
filterproc.c
r7155955 r3496369 1 #include " filterproc.h"1 #include "owl.h" 2 2 #include <sys/wait.h> 3 #include <fcntl.h>4 #include <glib.h>5 3 #include <poll.h> 6 #include <string.h>7 #include <unistd.h>8 4 9 5 /* Even in case of error, send_receive is responsible for closing wfd -
libfaim/Makefile.am
rb80bae0 r215c119 13 13 libfaim_a_CPPFLAGS = -DAIM_BUILDDATE=\"x\" -DAIM_BUILDTIME=\"x\" \ 14 14 -I${top_srcdir}/libfaim 15 16 EXTRA_DIST = oscar.c -
m4/ax_cflags_warn_all.m4
re9b4a2c r378ede7 25 25 # - $3 action-if-found : add value to shellvariable 26 26 # - $4 action-if-not-found : nothing 27 #28 # NOTE: These macros depend on AX_APPEND_FLAG.29 27 # 30 28 # LICENSE … … 59 57 # exception to the GPL to apply to your modified version as well. 60 58 61 #serial 1 459 #serial 10 62 60 63 AC_DEFUN([AX_ FLAGS_WARN_ALL],[dnl64 AS_VAR_PUSHDEF([FLAGS],[ _AC_LANG_PREFIX[]FLAGS])dnl65 AS_VAR_PUSHDEF([VAR],[ac_cv_ []_AC_LANG_ABBREV[]flags_warn_all])dnl61 AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl 62 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl 63 AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all])dnl 66 64 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], 67 65 VAR,[VAR="no, unknown" 68 ac_save_[]FLAGS="$[]FLAGS" 66 AC_LANG_PUSH([C]) 67 ac_save_[]FLAGS="$[]FLAGS" 68 for ac_arg dnl 69 in "-pedantic % -Wall" dnl GCC 70 "-xstrconst % -v" dnl Solaris C 71 "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix 72 "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX 73 "-ansi -ansiE % -fullwarn" dnl IRIX 74 "+ESlit % +w1" dnl HP-UX C 75 "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) 76 "-h conform % -h msglevel 2" dnl Cray C (Unicos) 77 # 78 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` 79 AC_COMPILE_IFELSE([AC_LANG_PROGRAM], 80 [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) 81 done 82 FLAGS="$ac_save_[]FLAGS" 83 AC_LANG_POP([C]) 84 ]) 85 case ".$VAR" in 86 .ok|.ok,*) m4_ifvaln($3,$3) ;; 87 .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ 88 AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) 89 m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; 90 *) m4_ifvaln($3,$3,[ 91 if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null 92 then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) 93 else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) 94 m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" 95 fi ]) ;; 96 esac 97 AS_VAR_POPDEF([VAR])dnl 98 AS_VAR_POPDEF([FLAGS])dnl 99 ]) 100 101 dnl the only difference - the LANG selection... and the default FLAGS 102 103 AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl 104 AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl 105 AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_warn_all])dnl 106 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], 107 VAR,[VAR="no, unknown" 108 AC_LANG_PUSH([C++]) 109 ac_save_[]FLAGS="$[]FLAGS" 110 for ac_arg dnl 111 in "-pedantic % -Wall" dnl GCC 112 "-xstrconst % -v" dnl Solaris C 113 "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix 114 "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX 115 "-ansi -ansiE % -fullwarn" dnl IRIX 116 "+ESlit % +w1" dnl HP-UX C 117 "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) 118 "-h conform % -h msglevel 2" dnl Cray C (Unicos) 119 # 120 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` 121 AC_COMPILE_IFELSE([AC_LANG_PROGRAM], 122 [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) 123 done 124 FLAGS="$ac_save_[]FLAGS" 125 AC_LANG_POP([C++]) 126 ]) 127 case ".$VAR" in 128 .ok|.ok,*) m4_ifvaln($3,$3) ;; 129 .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ 130 AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) 131 m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; 132 *) m4_ifvaln($3,$3,[ 133 if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null 134 then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) 135 else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) 136 m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" 137 fi ]) ;; 138 esac 139 AS_VAR_POPDEF([VAR])dnl 140 AS_VAR_POPDEF([FLAGS])dnl 141 ]) 142 143 dnl the only difference - the LANG selection... and the default FLAGS 144 145 AC_DEFUN([AX_FCFLAGS_WARN_ALL],[dnl 146 AS_VAR_PUSHDEF([FLAGS],[FCFLAGS])dnl 147 AS_VAR_PUSHDEF([VAR],[ax_cv_fcflags_warn_all])dnl 148 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], 149 VAR,[VAR="no, unknown" 150 AC_LANG_PUSH([Fortran]) 151 ac_save_[]FLAGS="$[]FLAGS" 69 152 for ac_arg dnl 70 153 in "-warn all % -warn all" dnl Intel … … 82 165 [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) 83 166 done 84 FLAGS="$ac_save_[]FLAGS" 167 FLAGS="$ac_save_[]FLAGS" 168 AC_LANG_POP([Fortran]) 85 169 ]) 86 AS_VAR_POPDEF([FLAGS])dnl87 AC_REQUIRE([AX_APPEND_FLAG])88 170 case ".$VAR" in 89 171 .ok|.ok,*) m4_ifvaln($3,$3) ;; 90 .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; 91 *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;; 172 .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ 173 AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) 174 m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; 175 *) m4_ifvaln($3,$3,[ 176 if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null 177 then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) 178 else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) 179 m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" 180 fi ]) ;; 92 181 esac 93 182 AS_VAR_POPDEF([VAR])dnl 94 ])dnl AX_FLAGS_WARN_ALL 183 AS_VAR_POPDEF([FLAGS])dnl 184 ]) 185 95 186 dnl implementation tactics: 96 187 dnl the for-argument contains a list of options. The first part of … … 103 194 dnl delimiter. A non-option comment can be given after "%%" marks 104 195 dnl which will be shown but not added to the respective C/CXXFLAGS. 105 106 AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl107 AC_LANG_PUSH([C])108 AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])109 AC_LANG_POP([C])110 ])111 112 AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl113 AC_LANG_PUSH([C++])114 AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])115 AC_LANG_POP([C++])116 ])117 118 AC_DEFUN([AX_FCFLAGS_WARN_ALL],[dnl119 AC_LANG_PUSH([Fortran])120 AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])121 AC_LANG_POP([Fortran])122 ]) -
m4/pkg.m4
r13a39ae8 r650fb2c 158 158 fi[]dnl 159 159 ])# PKG_CHECK_MODULES 160 161 162 # PKG_INSTALLDIR(DIRECTORY)163 # -------------------------164 # Substitutes the variable pkgconfigdir as the location where a module165 # should install pkg-config .pc files. By default the directory is166 # $libdir/pkgconfig, but the default can be changed by passing167 # DIRECTORY. The user can override through the --with-pkgconfigdir168 # parameter.169 AC_DEFUN([PKG_INSTALLDIR],170 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])171 m4_pushdef([pkg_description],172 [pkg-config installation directory @<:@]pkg_default[@:>@])173 AC_ARG_WITH([pkgconfigdir],174 [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,175 [with_pkgconfigdir=]pkg_default)176 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])177 m4_popdef([pkg_default])178 m4_popdef([pkg_description])179 ]) dnl PKG_INSTALLDIR180 181 182 # PKG_NOARCH_INSTALLDIR(DIRECTORY)183 # -------------------------184 # Substitutes the variable noarch_pkgconfigdir as the location where a185 # module should install arch-independent pkg-config .pc files. By186 # default the directory is $datadir/pkgconfig, but the default can be187 # changed by passing DIRECTORY. The user can override through the188 # --with-noarch-pkgconfigdir parameter.189 AC_DEFUN([PKG_NOARCH_INSTALLDIR],190 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])191 m4_pushdef([pkg_description],192 [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])193 AC_ARG_WITH([noarch-pkgconfigdir],194 [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,195 [with_noarch_pkgconfigdir=]pkg_default)196 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])197 m4_popdef([pkg_default])198 m4_popdef([pkg_description])199 ]) dnl PKG_NOARCH_INSTALLDIR200 201 202 # PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,203 # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])204 # -------------------------------------------205 # Retrieves the value of the pkg-config variable for the given module.206 AC_DEFUN([PKG_CHECK_VAR],207 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl208 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl209 210 _PKG_CONFIG([$1], [variable="][$3]["], [$2])211 AS_VAR_COPY([$1], [pkg_cv_][$1])212 213 AS_VAR_IF([$1], [""], [$5], [$4])dnl214 ])# PKG_CHECK_VAR -
owl.h
r6249a88f rbbc31e4 10 10 #define INC_BARNOWL_OWL_H 11 11 12 #include <config.h>12 #include "config.h" 13 13 14 14 #include "compat/compat.h" … … 608 608 extern owl_global g; 609 609 610 #include <owl_prototypes.h>610 #include "owl_prototypes.h" 611 611 612 612 /* These were missing from the Zephyr includes before Zephyr 3. */ -
perl/Makefile.am
ra870319 r10557e6 1 1 SUBDIRS = modules 2 nobase_dist_pkgdata_DATA = \3 lib/BarnOwl.pm \4 lib/BarnOwl/Complete/AIM.pm \5 lib/BarnOwl/Complete/Client.pm \6 lib/BarnOwl/Complete/Filter.pm \7 lib/BarnOwl/Complete/Zephyr.pm \8 lib/BarnOwl/Completion.pm \9 lib/BarnOwl/Completion/Context.pm \10 lib/BarnOwl/Completion/Util.pm \11 lib/BarnOwl/Editwin.pm \12 lib/BarnOwl/Help.pm \13 lib/BarnOwl/Hook.pm \14 lib/BarnOwl/Hooks.pm \15 lib/BarnOwl/MainLoopCompatHook.pm \16 lib/BarnOwl/Message.pm \17 lib/BarnOwl/Message/AIM.pm \18 lib/BarnOwl/Message/Admin.pm \19 lib/BarnOwl/Message/Generic.pm \20 lib/BarnOwl/Message/Loopback.pm \21 lib/BarnOwl/Message/Zephyr.pm \22 lib/BarnOwl/ModuleLoader.pm \23 lib/BarnOwl/Parse.pm \24 lib/BarnOwl/Style.pm \25 lib/BarnOwl/Style/Basic.pm \26 lib/BarnOwl/Style/Default.pm \27 lib/BarnOwl/Style/Legacy.pm \28 lib/BarnOwl/Style/OneLine.pm \29 lib/BarnOwl/Timer.pm \30 lib/BarnOwl/Zephyr.pm \31 lib/Module/Install/BarnOwl.pm -
perl/modules/Makefile.am
reb5e8fc r35c5bd8 2 2 3 3 EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib) 4 EXTRA_DIST += \5 Facebook/README \6 Twitter/README \7 Twitter/twitter.example8 4 9 5 all-local: $(MODULES) … … 13 9 MODULES_MAKEFILE = $(MODULES:=/Makefile) 14 10 $(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL 15 [ $(srcdir) = . ] || cp -srf --no-preserve=mode -- $(abs_srcdir)/$*/. $*16 11 $(AM_V_GEN)(cd $* && perl -I../../lib Makefile.PL) 17 12 … … 19 14 clean-local: $(MODULES_CLEAN) 20 15 $(MODULES_CLEAN): clean_%: 21 if [ $(srcdir) = . ]; then \ 22 (cd $* && { test ! -f Makefile || $(MAKE) realclean; }) && \ 23 rm -f $*/$*.par; \ 24 else \ 25 rm -rf $*; \ 26 fi 16 (cd $* && (test ! -f Makefile || $(MAKE) clean)) 27 17 28 18 MODULES_INSTALL = $(MODULES:%=module_install_%) … … 33 23 ${INSTALL_DATA} $*/$*.par ${DESTDIR}${pkgdatadir}/modules/$*.par 34 24 35 uninstall-local:36 rm -f $(MODULES:%=${DESTDIR}${pkgdatadir}/modules/%.par)37 38 25 .PHONY: $(MODULES) $(MODULES_CLEAN) $(MODULES_INSTALL) -
runtests.sh
r5db8835 rf6ab6ee 1 1 #!/bin/sh 2 exec env HARNESS_PERL=./tester prove --failures "${srcdir:=$(dirname "$0")}/t/"2 exec env HARNESS_PERL=./tester prove --failures t/ -
t/00-core-tests.t
r5db8835 r95414bf 1 1 #!/usr/bin/env perl 2 system("./tester", "--builtin"); 2 use File::Basename; 3 system(dirname($0) . "/../tester", "--builtin"); -
zcrypt.c
r6249a88f rd72ba1e 17 17 #include <ctype.h> 18 18 19 #include <config.h>19 #include "config.h" 20 20 21 21 #ifdef HAVE_KERBEROS_IV -
zephyr.c
r89f01bd rbbe7d4a 742 742 /* free then check the return */ 743 743 g_free(notice.z_message); 744 ZFreeNotice(¬ice); 744 745 g_free(zsender); 745 746 if (ret != ZERR_NONE) {
Note: See TracChangeset
for help on using the changeset viewer.