Revision: 35 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=35&view=rev Author: frlan Date: 2008-05-20 10:44:26 -0700 (Tue, 20 May 2008)
Log Message: ----------- Ported buildsystem from spellcheck plugin. Plugin doesn't compile at this moment
Modified Paths: -------------- trunk/geanysendmail/ChangeLog trunk/geanysendmail/configure.in trunk/geanysendmail/ltmain.sh
Added Paths: ----------- trunk/geanysendmail/AUTHORS trunk/geanysendmail/Makefile.in trunk/geanysendmail/NEWS trunk/geanysendmail/README trunk/geanysendmail/po/ trunk/geanysendmail/po/LINGUAS trunk/geanysendmail/po/Makefile.in.in trunk/geanysendmail/po/POTFILES.in trunk/geanysendmail/po/POTFILES.skip trunk/geanysendmail/po/de.po trunk/geanysendmail/po/geanysendmail.pot trunk/geanysendmail/src/ trunk/geanysendmail/src/Makefile.am trunk/geanysendmail/src/geanysendmail.c trunk/geanysendmail/src/icon.h
Removed Paths: ------------- trunk/geanysendmail/geanysendmail.c trunk/geanysendmail/icon.h
Added: trunk/geanysendmail/AUTHORS ===================================================================
Modified: trunk/geanysendmail/ChangeLog =================================================================== --- trunk/geanysendmail/ChangeLog 2008-05-20 17:13:01 UTC (rev 34) +++ trunk/geanysendmail/ChangeLog 2008-05-20 17:44:26 UTC (rev 35) @@ -1,3 +1,8 @@ +2008-05-20 Frank Lanitz frank@frank.uvena.de + + * Ported build system from spellcheck plugin. Thanks for it. + + 2008-05-13 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* Restart using ChangeLog.
Added: trunk/geanysendmail/Makefile.in =================================================================== --- trunk/geanysendmail/Makefile.in (rev 0) +++ trunk/geanysendmail/Makefile.in 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,666 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO config.guess config.sub depcomp install-sh ltmain.sh \ + missing mkinstalldirs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GEANY_CFLAGS = @GEANY_CFLAGS@ +GEANY_LIBS = @GEANY_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = src po +EXTRA_DIST = \ + autogen.sh \ + makefile.win32 \ + po/LINGUAS + +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\*]/\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\*]/\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '///!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} ; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} ; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} ; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} ; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\/]:[\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am + + +dist-bzip2: distdir + BZIP2=$(BZIP2_ENV) $(AMTAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir) + -rm -rf $(distdir) + +sign: + if test -f $(PACKAGE)-$(VERSION).tar.gz; then \ + gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.gz; fi + if test -f $(PACKAGE)-$(VERSION).tar.bz2; then \ + gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.bz2; fi +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT:
Added: trunk/geanysendmail/NEWS ===================================================================
Added: trunk/geanysendmail/README ===================================================================
Modified: trunk/geanysendmail/configure.in =================================================================== --- trunk/geanysendmail/configure.in 2008-05-20 17:13:01 UTC (rev 34) +++ trunk/geanysendmail/configure.in 2008-05-20 17:44:26 UTC (rev 35) @@ -1,22 +1,61 @@ -dnl Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59) +AC_INIT(configure.in) +AM_INIT_AUTOMAKE(geanysendmail, 0.4git)
+AM_CONFIG_HEADER(config.h)
-AC_INIT([geanysendmail], [0.4dev], [frank@frank.uvena.de]) +AC_PROG_CC
-AM_INIT_AUTOMAKE([1.9 foreign]) +AC_DISABLE_STATIC +AM_PROG_LIBTOOL +LIBTOOL="$LIBTOOL --silent"
-AC_PROG_CC -AC_PROG_LIBTOOL +AC_PROG_INSTALL
-PKG_CHECK_MODULES(GTK, [gtk+-2.0]) +# checking for Geany +PKG_CHECK_MODULES(GEANY, [geany >= 0.15]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS)
-PKG_CHECK_MODULES(GEANY, [geany >= 0.14]) -AC_SUBST(GEANY_CFLAGS) -AC_SUBST(GEANY_LIBS) +GEANY_VERSION=`$PKG_CONFIG --modversion geany` +GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
-AC_CONFIG_FILES([Makefile]) -AC_OUTPUT +# i18n +GETTEXT_PACKAGE=geanysendmail +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + +ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS + +AM_GLIB_GNU_GETTEXT +# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) +if test "x$MSGFMT" = "xno"; then + AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) +fi + +# intltool hack to define install_sh on Debian/Ubuntu systems +if test "x$install_sh" = "x"; then + install_sh="`pwd`/install-sh" + AC_SUBST(install_sh) +fi + +# get the plugin installed at the correct location for Geany +# TODO find a way to NOT override --libdir command line option if given +libdir="`$PKG_CONFIG --variable=libdir geany`/geany" + + +AC_OUTPUT([ +Makefile +src/Makefile +po/Makefile.in +]) + +echo "----------------------------------------" +echo "Install geanysendmail plugin binary in : ${libdir}" +echo "Install geanysendmail in : ${prefix}" +echo "Using Geany version : ${GEANY_VERSION}" +echo "Using GTK version : ${GTK_VERSION}" +echo "" +echo "Configuration is done OK." +echo ""
Deleted: trunk/geanysendmail/geanysendmail.c =================================================================== --- trunk/geanysendmail/geanysendmail.c 2008-05-20 17:13:01 UTC (rev 34) +++ trunk/geanysendmail/geanysendmail.c 2008-05-20 17:44:26 UTC (rev 35) @@ -1,316 +0,0 @@ -/* - * geanysendmail.c - * - * Copyright 2007, 2008 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * Copyright 2007 Enrico Tröger enrico.troeger@uvena.de - * Copyright 2007 Nick Treleaven nick.treleaven@btinternet.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -/* A little plugin to send a document as attachment using the preferred mail client */ - -#include "geany.h" -#include "support.h" -#include "plugindata.h" -#include "document.h" -#include "filetypes.h" -#include "pluginmacros.h" -#include "utils.h" -#include "keybindings.h" -#include "icon.h" - -PluginFields *plugin_fields; -GeanyData *geany_data; - -VERSION_CHECK(49) - -PLUGIN_INFO(_("GeanySendMail"), _("A little plugin to send the current \ -file as attachment by user's favorite mailer"), "0.4dev", "Frank Lanitz frank@frank.uvena.de") - -/* Keybinding(s) */ -enum -{ - SENDMAIL_KB, - COUNT_KB -}; - -PLUGIN_KEY_GROUP(sendmail, COUNT_KB) - - -static gchar *config_file = NULL; -static gchar *mailer = NULL; -gboolean icon_in_toolbar = FALSE; -/* Needed global to remove from toolbar again */ -GtkWidget *mailbutton = NULL; -GtkWidget *separator = NULL; -GtkWidget *separator2 = NULL; - -/* Callback for sending file as attachment */ -static void -send_as_attachment(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata) -{ - guint idx; - gchar *locale_filename = NULL; - gchar *command = NULL; - GError *error = NULL; - GString *cmd_str = NULL; - - - idx = documents->get_cur_idx(); - - if (doc_list[idx].file_name == NULL) - { - dialogs->show_save_as(); - } - else - { - documents->save_file(idx, FALSE); - } - - if (doc_list[idx].file_name != NULL) - { - if (mailer) - { - locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); - cmd_str = g_string_new(mailer); - - if (! utils->string_replace_all(cmd_str, "%f", locale_filename)) - ui->set_statusbar(FALSE, _("Filename placeholder not found. The executed command might have failed.")); - - command = g_string_free(cmd_str, FALSE); - g_spawn_command_line_async(command, &error); - if (error != NULL) - { - ui->set_statusbar(FALSE, _("Could not execute mailer. Please check your configuration.")); - g_error_free(error); - } - - g_free(locale_filename); - g_free(command); - } - else - { - ui->set_statusbar(FALSE, _("Please define a mailing tool first.")); - } - } - else - { - ui->set_statusbar(FALSE, _("File have to be saved before sending.")); - } -} - -static void key_send_as_attachment(G_GNUC_UNUSED guint key_id) -{ - send_as_attachment(NULL, NULL); -} - -void show_icon() -{ - GdkPixbuf *pixbuf = NULL; - GtkWidget *icon = NULL; - - int number_of_icons = 0; - number_of_icons = gtk_toolbar_get_n_items(GTK_TOOLBAR(app->toolbar)); - - pixbuf = gdk_pixbuf_new_from_inline(-1, mail_pixbuf, FALSE, NULL); - icon = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(pixbuf); - - separator = (GtkWidget*) gtk_separator_tool_item_new(); - gtk_widget_show (separator); - gtk_toolbar_insert(GTK_TOOLBAR(app->toolbar), GTK_TOOL_ITEM(separator), number_of_icons - 2); - - mailbutton = (GtkWidget*) gtk_tool_button_new (icon, "Mail"); - gtk_toolbar_insert(GTK_TOOLBAR(app->toolbar), GTK_TOOL_ITEM(mailbutton), number_of_icons - 1); - g_signal_connect (G_OBJECT(mailbutton), "clicked", G_CALLBACK(send_as_attachment), NULL); - gtk_widget_show_all (mailbutton); - - separator2 = (GtkWidget*) gtk_separator_tool_item_new(); - gtk_widget_show (separator2); - gtk_toolbar_insert(GTK_TOOLBAR(app->toolbar), GTK_TOOL_ITEM(separator2), number_of_icons); -} - -void cleanup_icon() -{ - if (mailbutton != NULL) - { - gtk_container_remove(GTK_CONTAINER (app->toolbar), mailbutton); - } - if (separator != NULL) - { - gtk_container_remove(GTK_CONTAINER (app->toolbar), separator); - } - if (separator2 != NULL) - { - gtk_container_remove(GTK_CONTAINER (app->toolbar), separator2); - } -} - -void configure(GtkWidget *parent) -{ - GtkWidget *dialog, *label1, *label2, *entry, *vbox; - GtkWidget *checkbox_icon_to_toolbar = NULL; - GKeyFile *config = g_key_file_new(); - gchar *config_dir = g_path_get_dirname(config_file); - gint tmp; - GtkTooltips *tooltip = NULL; - - tooltip = gtk_tooltips_new(); - - dialog = gtk_dialog_new_with_buttons(_("Mail Configuration"), - GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui->dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_box_set_spacing(GTK_BOX(vbox), 10); - - // add a label and a text entry to the dialog - label1 = gtk_label_new(_("Path and options for the mail programm:")); - gtk_widget_show(label1); - gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); - entry = gtk_entry_new(); - gtk_widget_show(entry); - if (mailer != NULL) - gtk_entry_set_text(GTK_ENTRY(entry), mailer); - - label2 = gtk_label_new(_("Note: %f will be replaced by your filename.")); - gtk_widget_show(label2); - gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); - - checkbox_icon_to_toolbar = gtk_check_button_new_with_label(_("Showing icon in toolbar (EXPERIMENTAL)")); - gtk_tooltips_set_tip(tooltip, checkbox_icon_to_toolbar, - _ - ("Shows a icon in the toolbar to send file more easy."), - NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_icon_to_toolbar), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar), icon_in_toolbar); - gtk_widget_show(checkbox_icon_to_toolbar); - - gtk_container_add(GTK_CONTAINER(vbox), label1); - gtk_container_add(GTK_CONTAINER(vbox), entry); - gtk_container_add(GTK_CONTAINER(vbox), label2); - gtk_box_pack_start(GTK_BOX(vbox), checkbox_icon_to_toolbar, TRUE, FALSE, 2); - - gtk_widget_show(vbox); - - // run the dialog and check for the response code - tmp = gtk_dialog_run(GTK_DIALOG(dialog)); - if (tmp == GTK_RESPONSE_ACCEPT) - { - g_free(mailer); - mailer = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); - - if (icon_in_toolbar == FALSE && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar)) == TRUE) - { - icon_in_toolbar = TRUE; - show_icon(); - } - else if (icon_in_toolbar == TRUE && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar)) == FALSE) - { - cleanup_icon(); - icon_in_toolbar = FALSE; - } - else - { - icon_in_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar)); - } - - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - g_key_file_set_string(config, "tools", "mailer", mailer); - g_key_file_set_boolean(config, "icon", "show_icon", icon_in_toolbar); - - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils->mkdir(config_dir, TRUE) != 0) - { - dialogs->show_msgbox(GTK_MESSAGE_ERROR, - _("Plugin configuration directory could not be created.")); - } - else - { - // write config to file - gchar *data = g_key_file_to_data(config, NULL, NULL); - utils->write_file(config_file, data); - g_free(data); - } - g_key_file_free(config); - g_free(config_dir); - } - - gtk_widget_destroy(dialog); -} - -/* Called by Geany to initialize the plugin */ -void init(GeanyData *data) -{ - GtkTooltips *tooltips = NULL; - - GKeyFile *config = g_key_file_new(); - - gchar *kb_label = _("Send file by mail"); - - GtkWidget *menu_mail = NULL; - GtkWidget *menu_mail_submenu = NULL; - GtkWidget *menu_mail_attachment = NULL; - - - config_file = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, - "geanysendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); - - // Initialising options from config file - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - mailer = g_key_file_get_string(config, "tools", "mailer", NULL); - icon_in_toolbar = g_key_file_get_boolean(config, "icon", "show_icon", NULL); - - g_key_file_free(config); - - tooltips = gtk_tooltips_new(); - - plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; - - if (icon_in_toolbar == TRUE) - { - show_icon(); - } - - // Build up menu - - menu_mail = gtk_image_menu_item_new_with_mnemonic(_("_Mail")); - gtk_container_add(GTK_CONTAINER(data->tools_menu), menu_mail); - - menu_mail_submenu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_mail), menu_mail_submenu); - - menu_mail_attachment = gtk_menu_item_new_with_mnemonic(_("_Mail document")); - gtk_container_add(GTK_CONTAINER(menu_mail_submenu), menu_mail_attachment); - gtk_tooltips_set_tip(tooltips, menu_mail_attachment, - _("Sends the opened file as unzipped attachment by any mailer from your $PATH"), NULL); - g_signal_connect(G_OBJECT(menu_mail_attachment), "activate", G_CALLBACK(send_as_attachment), NULL); - - /* setup keybindings */ - p_keybindings->set_item(plugin_key_group, SENDMAIL_KB, key_send_as_attachment, - 0, 0, "send_file_as_attachment", kb_label, menu_mail_attachment); - - gtk_widget_show_all(menu_mail); - plugin_fields->menu_item = menu_mail; -} - - -void cleanup() -{ - gtk_widget_destroy(plugin_fields->menu_item); - cleanup_icon(); - g_free(mailer); - g_free(config_file); -}
Deleted: trunk/geanysendmail/icon.h =================================================================== --- trunk/geanysendmail/icon.h 2008-05-20 17:13:01 UTC (rev 34) +++ trunk/geanysendmail/icon.h 2008-05-20 17:44:26 UTC (rev 35) @@ -1,50 +0,0 @@ -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (mail_pixbuf) -#endif -#ifdef __GNUC__ -static const guint8 mail_pixbuf[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 mail_pixbuf[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (520) */ - "\0\0\2\40" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (52) */ - "\0\0\0""4" - /* width (13) */ - "\0\0\0\15" - /* height (10) */ - "\0\0\0\12" - /* pixel_data: */ - "\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377" - "GGG\377\365\365\365\377\365\365\365\377\365\365\365\377\365\365\365\377" - "\365\365\365\377\365\365\365\377\365\365\365\377\365\365\365\377\365" - "\365\365\377222\377\0\0\0\377\0\0\0\377\365\365\365\377GGG\377\365\365" - "\365\377\365\365\365\377\365\365\365\377\364\364\364\377\365\365\365" - "\377\364\364\364\377\364\364\364\377GGG\377\301\301\301\377\0\0\0\377" - "\0\0\0\377\365\365\365\377\352\352\352\377GGG\377\365\365\365\377\365" - "\365\365\377\364\364\364\377\365\365\365\377\364\364\364\377GGG\377\353" - "\353\353\377\252\252\252\377\0\0\0\377\0\0\0\377\365\365\365\377\365" - "\365\365\377\365\365\365\377GGG\377\365\365\365\377\365\365\365\377\365" - "\365\365\377===\377\357\357\357\377\353\353\353\377\353\353\353\377\0" - "\0\0\377\0\0\0\377\363\363\363\377\365\365\365\377\357\357\357\377GG" - "G\377\77\77\77\377\365\365\365\377FFF\377GGG\377\365\365\365\377\363" - "\363\363\377\275\275\275\377\0\0\0\377\0\0\0\377\365\365\365\377\364" - "\364\364\377GGG\377\365\365\365\377\365\365\365\377GGG\377\365\365\365" - "\377\363\363\363\377GGG\377\326\326\326\377\240\240\240\377\0\0\0\377" - "\0\0\0\377\365\365\365\377GGG\377\364\364\364\377\365\365\365\377\365" - "\365\365\377\362\362\362\377\364\364\364\377\363\363\363\377\272\272" - "\272\377222\377\351\351\351\377\0\0\0\377\0\0\0\377GGG\377\240\240\240" - "\377\240\240\240\377\214\214\214\377\277\277\277\377\272\272\272\377" - "\332\332\332\377\315\315\315\377\247\247\247\377\323\323\323\377(((\377" - "\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0"}; - -
Modified: trunk/geanysendmail/ltmain.sh =================================================================== --- trunk/geanysendmail/ltmain.sh 2008-05-20 17:13:01 UTC (rev 34) +++ trunk/geanysendmail/ltmain.sh 2008-05-20 17:44:26 UTC (rev 35) @@ -1,8 +1,8 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit gord@gnu.ai.mit.edu, 1996 # # This program is free software; you can redistribute it and/or modify @@ -33,9 +33,6 @@ # function. progpath="$0"
-# define SED for historic ltconfig's generated by Libtool 1.3 -test -z "$SED" && SED=sed - # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -46,21 +43,22 @@
PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.22 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" +VERSION="1.5.26 Debian 1.5.26-4" +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi -# Same for EGREP, and just to be sure, do LTCC as well -if test "X$EGREP" = X ; then - EGREP=egrep -fi -if test "X$LTCC" = X ; then - LTCC=${CC-gcc} -fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -115,12 +113,20 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -if test "${LC_ALL+set}" = set; then - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL +lt_env= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test "${$lt_var+set}" = set; then + save_$lt_var=$$lt_var + lt_env="$lt_var=$$lt_var $lt_env" + $lt_var=C + export $lt_var + fi" +done + +if test -n "$lt_env"; then + lt_env="env $lt_env" fi -if test "${LANG+set}" = set; then - save_LANG="$LANG"; LANG=C; export LANG -fi
# Make sure IFS has a sensible default lt_nl=' @@ -146,31 +152,9 @@ preserve_args= lo2o="s/\.lo$/.${objext}/" o2lo="s/\.${objext}$/.lo/" +extracted_archives= +extracted_serial=0
-if test -z "$max_cmd_len"; then - i=0 - testring="ABCD" - new_result= - - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && - max_cmd_len="$new_result" && - test "$i" != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - testring="$testring$testring" - done - testring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - max_cmd_len=`expr $max_cmd_len / 2` -fi - ##################################### # Shell function definitions: # This seems to be the best place for them @@ -230,7 +214,13 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + $SED -n -e '1,100{ + / I /{ + s,.*,import, + p + q + } + }'` case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -291,21 +281,7 @@ esac CC_quoted="$CC_quoted $arg" done - # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' - trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"` - # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc - extendcc=${host}-${CC} - # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc - # (Gentoo-specific hack because we always export $CHOST) - mungedcc=${CHOST-${host}}-${trimedcc} case "$@ " in - "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\ - "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) - tagname=CC - break ;; - "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\ - "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\ - "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) # The compiler in the base compile command matches # the one in the tagged configuration. @@ -375,7 +351,17 @@ *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -502,11 +488,12 @@ ;;
--version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + echo "\ +$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +Copyright (C) 2008 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? ;;
@@ -803,9 +790,11 @@ *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; + *.[fF][09]?) xform=[fF][09]. ;; *.for) xform=for ;; *.java) xform=java ;; + *.obj) xform=obj ;; + *.sx) xform=sx ;; esac
libobj=`$echo "X$libobj" | $Xsed -e "s/.$xform$/.lo/"` @@ -899,7 +888,7 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$srcfile" "$lockfile" 2>/dev/null; do + until $run ln "$progpath" "$lockfile" 2>/dev/null; do $show "Waiting for $lockfile to be removed" sleep 2 done @@ -974,7 +963,7 @@ $run $rm "$lobj" "$output_obj"
$show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else test -n "$output_obj" && $run $rm $removelist exit $EXIT_FAILURE @@ -1046,7 +1035,7 @@ command="$command$suppress_output" $run $rm "$obj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else $run $rm $removelist exit $EXIT_FAILURE @@ -1179,6 +1168,7 @@ thread_safe=no vinfo= vinfo_number=no + single_module="${wl}-single_module"
func_infer_tag $base_compile
@@ -1186,8 +1176,9 @@ for arg do case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1195,12 +1186,20 @@ dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - else + ;; + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - fi + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1648,13 +1647,18 @@ continue ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" continue ;;
+ -multi_module) + single_module="${wl}-multi_module" + continue + ;; + -module) module=yes continue @@ -1668,10 +1672,11 @@ # -m* pass through architecture-specific compiler args for GCC # -m*, -t[45]*, -txscale* pass through architecture-specific # compiler args for GCC - # -pg pass through profiling flag for GCC + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1699,9 +1704,9 @@
-no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. + # and Darwin in order for the loader to find any dlls it needs. $echo "$modename: warning: `-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming `-no-fast-install' instead" 1>&2 fast_install=no @@ -1760,7 +1765,7 @@ continue ;;
- -static) + -static | -static-libtool-libs) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2130,7 +2135,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$pass" = dlopen; then @@ -2142,7 +2150,7 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -2157,7 +2165,12 @@ continue fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library lib="$searchdir/lib${name}${search_ext}" @@ -2538,7 +2551,9 @@
if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -2951,12 +2966,18 @@ # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=(.*)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in @@ -3104,9 +3125,10 @@
case $linkmode in oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: `-l' and `-L' are ignored for archives" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: `-l' and `-L' are ignored for archives" 1>&2 ;; + esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: `-dlopen' is ignored for archives" 1>&2 @@ -3234,7 +3256,7 @@ # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows) + darwin|linux|osf|windows|none) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3245,10 +3267,16 @@ age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; + *) + $echo "$modename: unknown library version type `$version_type'" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit $EXIT_FAILURE + ;; esac ;; no) @@ -3306,7 +3334,8 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;;
freebsd-aout) @@ -3320,8 +3349,11 @@ ;;
irix | nonstopux) - major=`expr $current - $age + 1` - + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; @@ -3458,11 +3490,11 @@ fi
# Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done + #for path in $notinst_path; do + # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + #done
if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3563,13 +3595,12 @@ int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l(.*)'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" -ne "0"; then + if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3608,9 +3639,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3642,7 +3671,7 @@ droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -3690,13 +3719,6 @@ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done - # It is ok to link against an archive when - # building a shared library. - if $AR -t $potlib > /dev/null 2>&1; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi if eval $file_magic_cmd "$potlib" 2>/dev/null \ | ${SED} 10q \ | $EGREP "$file_magic_regex" > /dev/null; then @@ -3935,7 +3957,10 @@ test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath="$hardcode_libdir_flag_spec_ld" + case $archive_cmds in + *$LD*) eval dep_rpath="$hardcode_libdir_flag_spec_ld" ;; + *) eval dep_rpath="$hardcode_libdir_flag_spec" ;; + esac else eval dep_rpath="$hardcode_libdir_flag_spec" fi @@ -4245,9 +4270,10 @@ ;;
obj) - if test -n "$deplibs"; then - $echo "$modename: warning: `-l' and `-L' are ignored for objects" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: `-l' and `-L' are ignored for objects" 1>&2 ;; + esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: `-dlopen' is ignored for objects" 1>&2 @@ -4294,12 +4320,14 @@ reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. wl=
if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs="$reload_objs $whole_archive_flag_spec" + eval tmp_whole_archive_flags="$whole_archive_flag_spec" + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4747,16 +4775,16 @@ case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` fi ;; * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ;; esac ;; @@ -4771,13 +4799,13 @@ # really was required.
# Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now. @@ -4864,7 +4892,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%$progdir/$file%g'` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%$progdir/$file%g' | $NL2SP` else # fast_install is set to needless relink_command= @@ -4901,7 +4929,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` fi
# Quote $echo for shipping. @@ -5308,6 +5336,20 @@ Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5434,11 +5476,6 @@ $echo >> $output "\ if test "$libtool_execute_magic" != "$magic"; then # Run the actual program with our arguments. - - # Make sure env LD_LIBRARY_PATH does not mess us up - if test -n "${LD_LIBRARY_PATH+set}"; then - export LD_LIBRARY_PATH=$progdir:$LD_LIBRARY_PATH - fi " case $host in # Backslashes separate directories on plain windows @@ -5455,7 +5492,7 @@ ;; esac $echo >> $output "\ - $echo "$0: cannot exec $program ${1+"$@"}" + $echo "$0: cannot exec $program $*" exit $EXIT_FAILURE fi else @@ -5641,7 +5678,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5666,53 +5703,9 @@ $echo "$modename: `$deplib' is not a valid libtool archive" 1>&2 exit $EXIT_FAILURE fi - if test "X$EGREP" = X ; then - EGREP=egrep - fi - # We do not want portage's install root ($D) present. Check only for - # this if the .la is being installed. - if test "$installed" = yes && test "$D"; then - eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/+:/:g'` - else - mynewdependency_lib="$libdir/$name" - fi - # Do not add duplicates - if test "$mynewdependency_lib"; then - my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` - if test -z "$my_little_ninja_foo_1"; then - newdependency_libs="$newdependency_libs $mynewdependency_lib" - fi - fi + newdependency_libs="$newdependency_libs $libdir/$name" ;; - *) - if test "$installed" = yes; then - # Rather use S=WORKDIR if our version of portage supports it. - # This is because some ebuild (gcc) do not use $S as buildroot. - if test "$PWORKDIR"; then - S="$PWORKDIR" - fi - # We do not want portage's build root ($S) present. - my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` - # We do not want portage's install root ($D) present. - my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` - if test -n "$my_little_ninja_foo_2" && test "$S"; then - mynewdependency_lib="" - elif test -n "$my_little_ninja_foo_3" && test "$D"; then - eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/+:/:g'` - else - mynewdependency_lib="$deplib" - fi - else - mynewdependency_lib="$deplib" - fi - # Do not add duplicates - if test "$mynewdependency_lib"; then - my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` - if test -z "$my_little_ninja_foo_4"; then - newdependency_libs="$newdependency_libs $mynewdependency_lib" - fi - fi - ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -5764,10 +5757,6 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac - # Do not add duplicates - if test "$installed" = yes && test "$D"; then - install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/+:/:g'` - fi $echo > $output "\ # $outputname - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP @@ -6034,9 +6023,9 @@
if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` fi
$echo "$modename: warning: relinking `$file'" 1>&2 @@ -6245,7 +6234,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command" if $run eval "$relink_command"; then : @@ -6456,8 +6445,10 @@ if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot find `$dlname' in `$dir' or `$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE + if test ! -f "$dir/$dlname"; then + $echo "$modename: cannot find `$dlname' in `$dir' or `$dir/$objdir'" 1>&2 + exit $EXIT_FAILURE + fi fi ;;
@@ -6521,12 +6512,12 @@ fi
# Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test "${save_$lt_var+set}" = set; then + $lt_var=$save_$lt_var; export $lt_var + fi" + done
# Now prepare to actually exec the command. exec_cmd="$cmd$args" @@ -6883,9 +6874,9 @@ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6899,9 +6890,11 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0]
All other options (arguments beginning with `-') are ignored.
Added: trunk/geanysendmail/po/LINGUAS =================================================================== --- trunk/geanysendmail/po/LINGUAS (rev 0) +++ trunk/geanysendmail/po/LINGUAS 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,2 @@ +# set of available languages (in alphabetic order) +de
Added: trunk/geanysendmail/po/Makefile.in.in =================================================================== --- trunk/geanysendmail/po/Makefile.in.in (rev 0) +++ trunk/geanysendmail/po/Makefile.in.in 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,271 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper drepper@gnu.ai.mit.edu +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. +# +# - Modified by Owen Taylor otaylor@redhat.com to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman jacob@ximian.com to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ +libdir = @libdir@ +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po +subdir = po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ + +CC = @CC@ +GENCAT = @GENCAT@ +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +SOURCES = +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ +$(POFILES) $(GMOFILES) $(SOURCES) + +POTFILES = \ + +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +INSTOBJEXT = @INSTOBJEXT@ + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ + --flag=g_error_new:3:c-format \ + --flag=g_set_error:4:c-format \ + --flag=g_markup_printf_escaped:1:c-format \ + --flag=g_log:3:c-format \ + --flag=g_print:1:c-format \ + --flag=g_printerr:1:c-format \ + --flag=g_printf:1:c-format \ + --flag=g_fprintf:2:c-format \ + --flag=g_sprintf:2:c-format \ + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ + && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ + fi; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "glib"; then \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + done + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + fi + +check: all + +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) + +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) +dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +# POTFILES is created from POTFILES.in by stripping comments, empty lines +# and Intltool tags (enclosed in square brackets), and appending a full +# relative path to them +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' \ + -e "s/^[.*] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT:
Added: trunk/geanysendmail/po/POTFILES.in =================================================================== --- trunk/geanysendmail/po/POTFILES.in (rev 0) +++ trunk/geanysendmail/po/POTFILES.in 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,3 @@ +# List of source files containing translatable strings. + +src/geanysendmail.c
Added: trunk/geanysendmail/po/POTFILES.skip =================================================================== --- trunk/geanysendmail/po/POTFILES.skip (rev 0) +++ trunk/geanysendmail/po/POTFILES.skip 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1 @@ +# List of source files containing translatable strings but should be ignored.
Added: trunk/geanysendmail/po/de.po =================================================================== --- trunk/geanysendmail/po/de.po (rev 0) +++ trunk/geanysendmail/po/de.po 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,69 @@ +#: src/geanysendmail.c:40 +msgid "GeanySendMail" +msgstr "" + +#: src/geanysendmail.c:40 +msgid "" +"A little plugin to send the current file as attachment by user's favorite " +"mailer" +msgstr "" + +#: src/geanysendmail.c:91 +msgid "Filename placeholder not found. The executed command might have failed." +msgstr "" + +#: src/geanysendmail.c:97 +msgid "Could not execute mailer. Please check your configuration." +msgstr "" + +#: src/geanysendmail.c:106 +msgid "Please define a mailing tool first." +msgstr "" + +#: src/geanysendmail.c:111 +msgid "File have to be saved before sending." +msgstr "" + +#: src/geanysendmail.c:173 +msgid "Mail Configuration" +msgstr "" + +#. add a label and a text entry to the dialog +#: src/geanysendmail.c:181 +msgid "Path and options for the mail programm:" +msgstr "" + +#: src/geanysendmail.c:189 +#, c-format +msgid "Note: \%f will be replaced by your filename." +msgstr "" + +#: src/geanysendmail.c:193 +msgid "Showing icon in toolbar (EXPERIMENTAL)" +msgstr "" + +#: src/geanysendmail.c:196 +msgid "Shows a icon in the toolbar to send file more easy." +msgstr "" + +#: src/geanysendmail.c:238 +msgid "Plugin configuration directory could not be created." +msgstr "" + +#: src/geanysendmail.c:261 +msgid "Send file by mail" +msgstr "" + +#. Build up menu +#: src/geanysendmail.c:289 +msgid "_Mail" +msgstr "" + +#: src/geanysendmail.c:295 +msgid "_Mail document" +msgstr "" + +#: src/geanysendmail.c:298 +msgid "" +"Sends the opened file as unzipped attachment by any mailer from your $PATH" +msgstr ""
Added: trunk/geanysendmail/po/geanysendmail.pot =================================================================== --- trunk/geanysendmail/po/geanysendmail.pot (rev 0) +++ trunk/geanysendmail/po/geanysendmail.pot 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,87 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR EMAIL@ADDRESS, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-05-20 14:55+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME EMAIL@ADDRESS\n" +"Language-Team: LANGUAGE LL@li.org\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/geanysendmail.c:40 +msgid "GeanySendMail" +msgstr "" + +#: src/geanysendmail.c:40 +msgid "" +"A little plugin to send the current file as attachment by user's favorite " +"mailer" +msgstr "" + +#: src/geanysendmail.c:91 +msgid "Filename placeholder not found. The executed command might have failed." +msgstr "" + +#: src/geanysendmail.c:97 +msgid "Could not execute mailer. Please check your configuration." +msgstr "" + +#: src/geanysendmail.c:106 +msgid "Please define a mailing tool first." +msgstr "" + +#: src/geanysendmail.c:111 +msgid "File have to be saved before sending." +msgstr "" + +#: src/geanysendmail.c:173 +msgid "Mail Configuration" +msgstr "" + +#. add a label and a text entry to the dialog +#: src/geanysendmail.c:181 +msgid "Path and options for the mail programm:" +msgstr "" + +#: src/geanysendmail.c:189 +#, c-format +msgid "Note: \%f will be replaced by your filename." +msgstr "" + +#: src/geanysendmail.c:193 +msgid "Showing icon in toolbar (EXPERIMENTAL)" +msgstr "" + +#: src/geanysendmail.c:196 +msgid "Shows a icon in the toolbar to send file more easy." +msgstr "" + +#: src/geanysendmail.c:238 +msgid "Plugin configuration directory could not be created." +msgstr "" + +#: src/geanysendmail.c:261 +msgid "Send file by mail" +msgstr "" + +#. Build up menu +#: src/geanysendmail.c:289 +msgid "_Mail" +msgstr "" + +#: src/geanysendmail.c:295 +msgid "_Mail document" +msgstr "" + +#: src/geanysendmail.c:298 +msgid "" +"Sends the opened file as unzipped attachment by any mailer from your $PATH" +msgstr ""
Added: trunk/geanysendmail/src/Makefile.am =================================================================== --- trunk/geanysendmail/src/Makefile.am (rev 0) +++ trunk/geanysendmail/src/Makefile.am 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,7 @@ + +lib_LTLIBRARIES = geanysendmail.la +geanysendmail_la_SOURCES = geanysendmail.c +geanysendmail_la_LDFLAGS = -module -avoid-version +geanysendmail_la_LIBADD = @GEANY_LIBS@ $(INTLLIBS) + +AM_CFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=""$(localedir)""
Added: trunk/geanysendmail/src/geanysendmail.c =================================================================== --- trunk/geanysendmail/src/geanysendmail.c (rev 0) +++ trunk/geanysendmail/src/geanysendmail.c 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,316 @@ +/* + * geanysendmail.c + * + * Copyright 2007, 2008 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007 Enrico Tröger enrico.troeger@uvena.de + * Copyright 2007 Nick Treleaven nick.treleaven@btinternet.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* A little plugin to send a document as attachment using the preferred mail client */ + +#include "geany.h" +#include "support.h" +#include "plugindata.h" +#include "document.h" +#include "filetypes.h" +#include "pluginmacros.h" +#include "utils.h" +#include "keybindings.h" +#include "icon.h" + +PluginFields *plugin_fields; +GeanyData *geany_data; + +VERSION_CHECK(49) + +PLUGIN_INFO(_("GeanySendMail"), _("A little plugin to send the current \ +file as attachment by user's favorite mailer"), "0.4dev", "Frank Lanitz frank@frank.uvena.de") + +/* Keybinding(s) */ +enum +{ + SENDMAIL_KB, + COUNT_KB +}; + +PLUGIN_KEY_GROUP(sendmail, COUNT_KB) + + +static gchar *config_file = NULL; +static gchar *mailer = NULL; +gboolean icon_in_toolbar = FALSE; +/* Needed global to remove from toolbar again */ +GtkWidget *mailbutton = NULL; +GtkWidget *separator = NULL; +GtkWidget *separator2 = NULL; + +/* Callback for sending file as attachment */ +static void +send_as_attachment(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata) +{ + guint idx; + gchar *locale_filename = NULL; + gchar *command = NULL; + GError *error = NULL; + GString *cmd_str = NULL; + + + idx = documents->get_cur_idx(); + + if (doc_list[idx].file_name == NULL) + { + dialogs->show_save_as(); + } + else + { + documents->save_file(idx, FALSE); + } + + if (doc_list[idx].file_name != NULL) + { + if (mailer) + { + locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); + cmd_str = g_string_new(mailer); + + if (! utils->string_replace_all(cmd_str, "%f", locale_filename)) + ui->set_statusbar(FALSE, _("Filename placeholder not found. The executed command might have failed.")); + + command = g_string_free(cmd_str, FALSE); + g_spawn_command_line_async(command, &error); + if (error != NULL) + { + ui->set_statusbar(FALSE, _("Could not execute mailer. Please check your configuration.")); + g_error_free(error); + } + + g_free(locale_filename); + g_free(command); + } + else + { + ui->set_statusbar(FALSE, _("Please define a mailing tool first.")); + } + } + else + { + ui->set_statusbar(FALSE, _("File have to be saved before sending.")); + } +} + +static void key_send_as_attachment(G_GNUC_UNUSED guint key_id) +{ + send_as_attachment(NULL, NULL); +} + +void show_icon() +{ + GdkPixbuf *pixbuf = NULL; + GtkWidget *icon = NULL; + + int number_of_icons = 0; + number_of_icons = gtk_toolbar_get_n_items(GTK_TOOLBAR(app->toolbar)); + + pixbuf = gdk_pixbuf_new_from_inline(-1, mail_pixbuf, FALSE, NULL); + icon = gtk_image_new_from_pixbuf(pixbuf); + g_object_unref(pixbuf); + + separator = (GtkWidget*) gtk_separator_tool_item_new(); + gtk_widget_show (separator); + gtk_toolbar_insert(GTK_TOOLBAR(app->toolbar), GTK_TOOL_ITEM(separator), number_of_icons - 2); + + mailbutton = (GtkWidget*) gtk_tool_button_new (icon, "Mail"); + gtk_toolbar_insert(GTK_TOOLBAR(app->toolbar), GTK_TOOL_ITEM(mailbutton), number_of_icons - 1); + g_signal_connect (G_OBJECT(mailbutton), "clicked", G_CALLBACK(send_as_attachment), NULL); + gtk_widget_show_all (mailbutton); + + separator2 = (GtkWidget*) gtk_separator_tool_item_new(); + gtk_widget_show (separator2); + gtk_toolbar_insert(GTK_TOOLBAR(app->toolbar), GTK_TOOL_ITEM(separator2), number_of_icons); +} + +void cleanup_icon() +{ + if (mailbutton != NULL) + { + gtk_container_remove(GTK_CONTAINER (app->toolbar), mailbutton); + } + if (separator != NULL) + { + gtk_container_remove(GTK_CONTAINER (app->toolbar), separator); + } + if (separator2 != NULL) + { + gtk_container_remove(GTK_CONTAINER (app->toolbar), separator2); + } +} + +void configure(GtkWidget *parent) +{ + GtkWidget *dialog, *label1, *label2, *entry, *vbox; + GtkWidget *checkbox_icon_to_toolbar = NULL; + GKeyFile *config = g_key_file_new(); + gchar *config_dir = g_path_get_dirname(config_file); + gint tmp; + GtkTooltips *tooltip = NULL; + + tooltip = gtk_tooltips_new(); + + dialog = gtk_dialog_new_with_buttons(_("Mail Configuration"), + GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + vbox = ui->dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); + gtk_box_set_spacing(GTK_BOX(vbox), 10); + + // add a label and a text entry to the dialog + label1 = gtk_label_new(_("Path and options for the mail programm:")); + gtk_widget_show(label1); + gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); + entry = gtk_entry_new(); + gtk_widget_show(entry); + if (mailer != NULL) + gtk_entry_set_text(GTK_ENTRY(entry), mailer); + + label2 = gtk_label_new(_("Note: %f will be replaced by your filename.")); + gtk_widget_show(label2); + gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); + + checkbox_icon_to_toolbar = gtk_check_button_new_with_label(_("Showing icon in toolbar (EXPERIMENTAL)")); + gtk_tooltips_set_tip(tooltip, checkbox_icon_to_toolbar, + _ + ("Shows a icon in the toolbar to send file more easy."), + NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_icon_to_toolbar), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar), icon_in_toolbar); + gtk_widget_show(checkbox_icon_to_toolbar); + + gtk_container_add(GTK_CONTAINER(vbox), label1); + gtk_container_add(GTK_CONTAINER(vbox), entry); + gtk_container_add(GTK_CONTAINER(vbox), label2); + gtk_box_pack_start(GTK_BOX(vbox), checkbox_icon_to_toolbar, TRUE, FALSE, 2); + + gtk_widget_show(vbox); + + // run the dialog and check for the response code + tmp = gtk_dialog_run(GTK_DIALOG(dialog)); + if (tmp == GTK_RESPONSE_ACCEPT) + { + g_free(mailer); + mailer = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); + + if (icon_in_toolbar == FALSE && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar)) == TRUE) + { + icon_in_toolbar = TRUE; + show_icon(); + } + else if (icon_in_toolbar == TRUE && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar)) == FALSE) + { + cleanup_icon(); + icon_in_toolbar = FALSE; + } + else + { + icon_in_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_icon_to_toolbar)); + } + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + g_key_file_set_string(config, "tools", "mailer", mailer); + g_key_file_set_boolean(config, "icon", "show_icon", icon_in_toolbar); + + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils->mkdir(config_dir, TRUE) != 0) + { + dialogs->show_msgbox(GTK_MESSAGE_ERROR, + _("Plugin configuration directory could not be created.")); + } + else + { + // write config to file + gchar *data = g_key_file_to_data(config, NULL, NULL); + utils->write_file(config_file, data); + g_free(data); + } + g_key_file_free(config); + g_free(config_dir); + } + + gtk_widget_destroy(dialog); +} + +/* Called by Geany to initialize the plugin */ +void init(GeanyData *data) +{ + GtkTooltips *tooltips = NULL; + + GKeyFile *config = g_key_file_new(); + + gchar *kb_label = _("Send file by mail"); + + GtkWidget *menu_mail = NULL; + GtkWidget *menu_mail_submenu = NULL; + GtkWidget *menu_mail_attachment = NULL; + + + config_file = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "geanysendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); + + // Initialising options from config file + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + mailer = g_key_file_get_string(config, "tools", "mailer", NULL); + icon_in_toolbar = g_key_file_get_boolean(config, "icon", "show_icon", NULL); + + g_key_file_free(config); + + tooltips = gtk_tooltips_new(); + + plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; + + if (icon_in_toolbar == TRUE) + { + show_icon(); + } + + // Build up menu + + menu_mail = gtk_image_menu_item_new_with_mnemonic(_("_Mail")); + gtk_container_add(GTK_CONTAINER(data->tools_menu), menu_mail); + + menu_mail_submenu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_mail), menu_mail_submenu); + + menu_mail_attachment = gtk_menu_item_new_with_mnemonic(_("_Mail document")); + gtk_container_add(GTK_CONTAINER(menu_mail_submenu), menu_mail_attachment); + gtk_tooltips_set_tip(tooltips, menu_mail_attachment, + _("Sends the opened file as unzipped attachment by any mailer from your $PATH"), NULL); + g_signal_connect(G_OBJECT(menu_mail_attachment), "activate", G_CALLBACK(send_as_attachment), NULL); + + /* setup keybindings */ + p_keybindings->set_item(plugin_key_group, SENDMAIL_KB, key_send_as_attachment, + 0, 0, "send_file_as_attachment", kb_label, menu_mail_attachment); + + gtk_widget_show_all(menu_mail); + plugin_fields->menu_item = menu_mail; +} + + +void cleanup() +{ + gtk_widget_destroy(plugin_fields->menu_item); + cleanup_icon(); + g_free(mailer); + g_free(config_file); +}
Added: trunk/geanysendmail/src/icon.h =================================================================== --- trunk/geanysendmail/src/icon.h (rev 0) +++ trunk/geanysendmail/src/icon.h 2008-05-20 17:44:26 UTC (rev 35) @@ -0,0 +1,50 @@ +/* GdkPixbuf RGBA C-Source image dump */ + +#ifdef __SUNPRO_C +#pragma align 4 (mail_pixbuf) +#endif +#ifdef __GNUC__ +static const guint8 mail_pixbuf[] __attribute__ ((__aligned__ (4))) = +#else +static const guint8 mail_pixbuf[] = +#endif +{ "" + /* Pixbuf magic (0x47646b50) */ + "GdkP" + /* length: header (24) + pixel_data (520) */ + "\0\0\2\40" + /* pixdata_type (0x1010002) */ + "\1\1\0\2" + /* rowstride (52) */ + "\0\0\0""4" + /* width (13) */ + "\0\0\0\15" + /* height (10) */ + "\0\0\0\12" + /* pixel_data: */ + "\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" + "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377" + "GGG\377\365\365\365\377\365\365\365\377\365\365\365\377\365\365\365\377" + "\365\365\365\377\365\365\365\377\365\365\365\377\365\365\365\377\365" + "\365\365\377222\377\0\0\0\377\0\0\0\377\365\365\365\377GGG\377\365\365" + "\365\377\365\365\365\377\365\365\365\377\364\364\364\377\365\365\365" + "\377\364\364\364\377\364\364\364\377GGG\377\301\301\301\377\0\0\0\377" + "\0\0\0\377\365\365\365\377\352\352\352\377GGG\377\365\365\365\377\365" + "\365\365\377\364\364\364\377\365\365\365\377\364\364\364\377GGG\377\353" + "\353\353\377\252\252\252\377\0\0\0\377\0\0\0\377\365\365\365\377\365" + "\365\365\377\365\365\365\377GGG\377\365\365\365\377\365\365\365\377\365" + "\365\365\377===\377\357\357\357\377\353\353\353\377\353\353\353\377\0" + "\0\0\377\0\0\0\377\363\363\363\377\365\365\365\377\357\357\357\377GG" + "G\377\77\77\77\377\365\365\365\377FFF\377GGG\377\365\365\365\377\363" + "\363\363\377\275\275\275\377\0\0\0\377\0\0\0\377\365\365\365\377\364" + "\364\364\377GGG\377\365\365\365\377\365\365\365\377GGG\377\365\365\365" + "\377\363\363\363\377GGG\377\326\326\326\377\240\240\240\377\0\0\0\377" + "\0\0\0\377\365\365\365\377GGG\377\364\364\364\377\365\365\365\377\365" + "\365\365\377\362\362\362\377\364\364\364\377\363\363\363\377\272\272" + "\272\377222\377\351\351\351\377\0\0\0\377\0\0\0\377GGG\377\240\240\240" + "\377\240\240\240\377\214\214\214\377\277\277\277\377\272\272\272\377" + "\332\332\332\377\315\315\315\377\247\247\247\377\323\323\323\377(((\377" + "\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" + "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0"}; + +
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.