From 689e0830b9e89f732fc57b51d9a3805470276611 Mon Sep 17 00:00:00 2001 From: Dominic Radermacher Date: Sun, 18 Jun 2017 11:01:25 +0200 Subject: [PATCH] updated eMail of author --- AUTHORS | 2 +- configure | 71 +++++++++++++++++++++++----------------------------- configure.ac | 4 +-- 3 files changed, 34 insertions(+), 43 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9f0df63..a0f03b2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ -ptouch-print written by Dominic Radermacher +ptouch-print written by Dominic Radermacher diff --git a/configure b/configure index fce6a07..6680ff4 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for ptouch 1.3.3. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,7 +267,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: dominic.radermacher@gmail.com about your system, +$0: blip@mockmoon-cybernetics.ch about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -582,7 +582,7 @@ PACKAGE_NAME='ptouch' PACKAGE_TARNAME='ptouch' PACKAGE_VERSION='1.3.3' PACKAGE_STRING='ptouch 1.3.3' -PACKAGE_BUGREPORT='dominic.radermacher@gmail.com' +PACKAGE_BUGREPORT='blip@mockmoon-cybernetics.ch' PACKAGE_URL='' ac_unique_file="src/libptouch.c" @@ -1407,7 +1407,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1717,9 +1717,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------- ## -## Report this to dominic.radermacher@gmail.com ## -## -------------------------------------------- ##" +( $as_echo "## ------------------------------------------- ## +## Report this to blip@mockmoon-cybernetics.ch ## +## ------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -5624,42 +5624,36 @@ else if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - am_cv_func_iconv_works=no - for ac_iconv_const in '' 'const'; do - if test "$cross_compiling" = yes; then : - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac + if test "$cross_compiling" = yes; then : + + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include - -#ifndef ICONV_CONST -# define ICONV_CONST $ac_iconv_const -#endif - -int -main () +int main () { -int result = 0; + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + static const char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - ICONV_CONST char *inptr = input; + const char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - &inptr, &inbytesleft, + (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -5672,14 +5666,14 @@ int result = 0; iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static ICONV_CONST char input[] = "\263"; + static const char input[] = "\263"; char buf[10]; - ICONV_CONST char *inptr = input; + const char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - &inptr, &inbytesleft, + (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -5691,14 +5685,14 @@ int result = 0; iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static ICONV_CONST char input[] = "\304"; + static const char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - ICONV_CONST char *inptr = input; + const char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - &inptr, &inbytesleft, + (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -5711,14 +5705,14 @@ int result = 0; iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - ICONV_CONST char *inptr = input; + const char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - &inptr, &inbytesleft, + (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -5738,20 +5732,17 @@ int result = 0; && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; - - ; - return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes +else + am_cv_func_iconv_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - test "$am_cv_func_iconv_works" = no || break - done LIBS="$am_save_LIBS" fi @@ -7395,7 +7386,7 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff --git a/configure.ac b/configure.ac index 66df488..9ecf222 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # # ptouch-print - Print labels with images or text on a Brother P-Touch # -# Copyright (C) 2015 Dominic Radermacher +# Copyright (C) 2015 Dominic Radermacher # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3 as @@ -20,7 +20,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([ptouch], [1.3.3], [dominic.radermacher@gmail.com]) +AC_INIT([ptouch], [1.3.3], [blip@mockmoon-cybernetics.ch]) AC_CONFIG_SRCDIR([src/libptouch.c]) AC_CONFIG_HEADERS([config.h]) -- 2.39.5