diff -Nru elmo-0.8.2/BUGS elmo-0.8.2-/BUGS --- elmo-0.8.2/BUGS 2003-08-17 12:17:35.000000000 +0200 +++ elmo-0.8.2-/BUGS 2003-08-17 16:08:59.000000000 +0200 @@ -3,7 +3,3 @@ incorrectly. It's possible that part of displayed mail may be visible in attachment list. I suppose it's a bug in ncurses... but am not sure. - -* NLS - If you cannot compile elmo because linker complains about gettext - then you should probably run configure with --disable-nls switch. diff -Nru elmo-0.8.2/config.h.in elmo-0.8.2-/config.h.in --- elmo-0.8.2/config.h.in 2003-08-17 12:46:09.000000000 +0200 +++ elmo-0.8.2-/config.h.in 2003-08-17 23:15:43.000000000 +0200 @@ -148,6 +148,9 @@ /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP diff -Nru elmo-0.8.2/configure elmo-0.8.2-/configure --- elmo-0.8.2/configure 2003-08-17 12:45:47.000000000 +0200 +++ elmo-0.8.2-/configure 2003-08-17 23:15:16.000000000 +0200 @@ -308,7 +308,7 @@ # include #endif" -ac_subst_vars='HAVE_SHORT_NAME SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB MAILDIR_SUPPORT_TRUE MAILDIR_SUPPORT_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='HAVE_SHORT_NAME SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB MAILDIR_SUPPORT_TRUE MAILDIR_SUPPORT_FALSE FREEBSD_TRUE FREEBSD_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3045,6 +3045,90 @@ fi +for ac_func in strchr +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + ALL_LINGUAS="pl de" MKINSTALLDIRS= @@ -8669,6 +8753,18 @@ fi +kupa=`echo $build_os | sed 's/\(.*\)\-.*/\1/'` + + +if test "$kupa" = freebsd; then + FREEBSD_TRUE= + FREEBSD_FALSE='#' +else + FREEBSD_TRUE='#' + FREEBSD_FALSE= +fi + + ac_config_files="$ac_config_files Makefile po/Makefile.in intl/Makefile doc/Makefile src/Makefile" cat >confcache <<\_ACEOF @@ -8790,6 +8886,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${FREEBSD_TRUE}" && test -z "${FREEBSD_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"FREEBSD\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"FREEBSD\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -9409,6 +9512,8 @@ s,@POSUB@,$POSUB,;t t s,@MAILDIR_SUPPORT_TRUE@,$MAILDIR_SUPPORT_TRUE,;t t s,@MAILDIR_SUPPORT_FALSE@,$MAILDIR_SUPPORT_FALSE,;t t +s,@FREEBSD_TRUE@,$FREEBSD_TRUE,;t t +s,@FREEBSD_FALSE@,$FREEBSD_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff -Nru elmo-0.8.2/configure.in elmo-0.8.2-/configure.in --- elmo-0.8.2/configure.in 2003-08-17 12:17:35.000000000 +0200 +++ elmo-0.8.2-/configure.in 2003-08-17 16:07:33.000000000 +0200 @@ -16,6 +16,8 @@ AC_PROG_CC AM_PROG_LEX +dnl Unfortunately AM_GNU_GETTEXT doesn't call this macro. +AC_CHECK_FUNCS(strchr) dnl dnl NLS @@ -104,6 +106,12 @@ AM_CONDITIONAL([MAILDIR_SUPPORT], [test "$have_scandir" = yes]) fi +dnl +dnl -pthread for FreeBSD +dnl +kupa=`echo $build_os | sed 's/\(.*\)\-.*/\1/'` +AM_CONDITIONAL([FREEBSD], [test "$kupa" = freebsd]) + AC_OUTPUT(Makefile \ po/Makefile.in \ diff -Nru elmo-0.8.2/doc/Makefile.in elmo-0.8.2-/doc/Makefile.in --- elmo-0.8.2/doc/Makefile.in 2003-08-17 12:46:11.000000000 +0200 +++ elmo-0.8.2-/doc/Makefile.in 2003-08-17 23:15:46.000000000 +0200 @@ -61,6 +61,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +FREEBSD_FALSE = @FREEBSD_FALSE@ +FREEBSD_TRUE = @FREEBSD_TRUE@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ diff -Nru elmo-0.8.2/Makefile.am elmo-0.8.2-/Makefile.am --- elmo-0.8.2/Makefile.am 2003-07-23 09:54:19.000000000 +0200 +++ elmo-0.8.2-/Makefile.am 2003-08-17 15:41:39.000000000 +0200 @@ -1,2 +1,2 @@ EXTRA_DIST = BUGS TODO ADVOCACY exec_table.pl config.rpath -SUBDIRS = doc src po intl +SUBDIRS = doc intl po src diff -Nru elmo-0.8.2/Makefile.in elmo-0.8.2-/Makefile.in --- elmo-0.8.2/Makefile.in 2003-08-17 12:45:46.000000000 +0200 +++ elmo-0.8.2-/Makefile.in 2003-08-17 23:15:14.000000000 +0200 @@ -61,6 +61,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +FREEBSD_FALSE = @FREEBSD_FALSE@ +FREEBSD_TRUE = @FREEBSD_TRUE@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ @@ -144,7 +146,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = BUGS TODO ADVOCACY exec_table.pl config.rpath -SUBDIRS = doc src po intl +SUBDIRS = doc intl po src subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -Nru elmo-0.8.2/src/attach.h elmo-0.8.2-/src/attach.h --- elmo-0.8.2/src/attach.h 2003-06-19 11:18:01.000000000 +0200 +++ elmo-0.8.2-/src/attach.h 2003-08-17 15:16:47.000000000 +0200 @@ -46,15 +46,25 @@ ****************************************************************************/ extern void attach_open (mail_t *mail); +/** close this window */ extern void attach_close (void); +/** refresh this window */ extern void attach_refresh (void); +/** display this attachment */ extern void attach_hit (void); +/** move on to the next position */ extern void attach_next (void); +/** move to the previous position */ extern void attach_prev (void); +/** move on to the next page */ extern void attach_next_page (void); +/** move to the previous page */ extern void attach_prev_page (void); +/** move to the first position */ extern void attach_first (void); +/** move to the last position */ extern void attach_last (void); +/** save attachment to file */ extern void attach_save (void); /**************************************************************************** diff -Nru elmo-0.8.2/src/exec_table.t elmo-0.8.2-/src/exec_table.t --- elmo-0.8.2/src/exec_table.t 2003-08-17 12:17:36.000000000 +0200 +++ elmo-0.8.2-/src/exec_table.t 2003-08-17 15:37:55.000000000 +0200 @@ -38,16 +38,16 @@ {"abook_add_first", abook_add_first, NULL, "move to the first position"}, {"abook_add_last", abook_add_last, NULL, "move to the last position"}, {"abook_add_hit", abook_add_hit, NULL, "add this address to addressbook"}, -{"attach_close", attach_close, NULL, NULL}, -{"attach_refresh", attach_refresh, NULL, NULL}, -{"attach_hit", attach_hit, NULL, NULL}, -{"attach_next", attach_next, NULL, NULL}, -{"attach_prev", attach_prev, NULL, NULL}, -{"attach_next_page", attach_next_page, NULL, NULL}, -{"attach_prev_page", attach_prev_page, NULL, NULL}, -{"attach_first", attach_first, NULL, NULL}, -{"attach_last", attach_last, NULL, NULL}, -{"attach_save", attach_save, NULL, NULL}, +{"attach_close", attach_close, NULL, "close this window"}, +{"attach_refresh", attach_refresh, NULL, "refresh this window"}, +{"attach_hit", attach_hit, NULL, "display this attachment"}, +{"attach_next", attach_next, NULL, "move on to the next position"}, +{"attach_prev", attach_prev, NULL, "move to the previous position"}, +{"attach_next_page", attach_next_page, NULL, "move on to the next page"}, +{"attach_prev_page", attach_prev_page, NULL, "move to the previous page"}, +{"attach_first", attach_first, NULL, "move to the first position"}, +{"attach_last", attach_last, NULL, "move to the last position"}, +{"attach_save", attach_save, NULL, "save attachment to file"}, {"box_selection_open", box_selection_open, NULL, "change box"}, {"box_selection_next", box_selection_next, NULL, "move on to the next position"}, {"box_selection_prev", box_selection_prev, NULL, "move to the previous position"}, diff -Nru elmo-0.8.2/src/Makefile.am elmo-0.8.2-/src/Makefile.am --- elmo-0.8.2/src/Makefile.am 2003-08-17 12:17:35.000000000 +0200 +++ elmo-0.8.2-/src/Makefile.am 2003-08-17 15:40:13.000000000 +0200 @@ -35,8 +35,12 @@ endif elmo_SOURCES = $(ZRODLA_elmo) $(MAILDIR_elmo) +elmo_LDADD = $(LIBINTL) +if FREEBSD +elmo_LDFLAGS = -pthread +else elmo_LDFLAGS = -rdynamic - +endif check_PROGRAMS = exampl exampl_SOURCES = exampl.c token.c token.h xmalloc.c xmalloc.h hash.c hash.h \ diff -Nru elmo-0.8.2/src/Makefile.in elmo-0.8.2-/src/Makefile.in --- elmo-0.8.2/src/Makefile.in 2003-08-17 12:46:15.000000000 +0200 +++ elmo-0.8.2-/src/Makefile.in 2003-08-17 23:15:55.000000000 +0200 @@ -61,6 +61,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +FREEBSD_FALSE = @FREEBSD_FALSE@ +FREEBSD_TRUE = @FREEBSD_TRUE@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ @@ -178,7 +180,9 @@ @address@hidden = maildir.c mybox.c elmo_SOURCES = $(ZRODLA_elmo) $(MAILDIR_elmo) -elmo_LDFLAGS = -rdynamic +elmo_LDADD = $(LIBINTL) address@hidden@elmo_LDFLAGS = -pthread address@hidden@elmo_LDFLAGS = -rdynamic check_PROGRAMS = exampl exampl_SOURCES = exampl.c token.c token.h xmalloc.c xmalloc.h hash.c hash.h \ @@ -244,7 +248,6 @@ @MAILDIR_SUPPORT_FALSE@ mybox-void.$(OBJEXT) am_elmo_OBJECTS = $(am__objects_1) $(am__objects_2) elmo_OBJECTS = $(am_elmo_OBJECTS) -elmo_LDADD = $(LDADD) elmo_DEPENDENCIES = am_exampl_OBJECTS = exampl.$(OBJEXT) token.$(OBJEXT) xmalloc.$(OBJEXT) \ hash.$(OBJEXT) memblock.$(OBJEXT) debug.$(OBJEXT) \