Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 531958 | Differences between
and this patch

Collapse All | Expand All

(-)most-5.0.0a/autoconf/configure.ac (-1 lines)
Lines 62-68 getpgrp tcgetpgrp \ Link Here
62
)
62
)
63
63
64
JD_SET_OBJ_SRC_DIR
64
JD_SET_OBJ_SRC_DIR
65
JD_TERMCAP
66
JD_WITH_LIBRARY(slang)
65
JD_WITH_LIBRARY(slang)
67
JD_GCC_WARNINGS
66
JD_GCC_WARNINGS
68
JD_GET_MODULES(src/modules.lis)
67
JD_GET_MODULES(src/modules.lis)
(-)most-5.0.0a/configure (-94 / +7 lines)
Lines 700-707 X_EXTRA_LIBS Link Here
700
SRCDIR
700
SRCDIR
701
OBJDIR
701
OBJDIR
702
ELFDIR
702
ELFDIR
703
TERMCAP
704
MISC_TERMINFO_DIRS
705
SLANG_LIB
703
SLANG_LIB
706
SLANG_INC
704
SLANG_INC
707
PROGRAM_OFILES
705
PROGRAM_OFILES
Lines 9064-9076 _ACEOF Link Here
9064
cat confdefs.h >>conftest.$ac_ext
9062
cat confdefs.h >>conftest.$ac_ext
9065
cat >>conftest.$ac_ext <<_ACEOF
9063
cat >>conftest.$ac_ext <<_ACEOF
9066
/* end confdefs.h.  */
9064
/* end confdefs.h.  */
9067
#include <sys/types.h> /* for off_t */
9065
#include <stdio.h>
9068
     #include <stdio.h>
9069
int
9066
int
9070
main ()
9067
main ()
9071
{
9068
{
9072
int (*fp) (FILE *, off_t, int) = fseeko;
9069
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
9073
     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
9074
  ;
9070
  ;
9075
  return 0;
9071
  return 0;
9076
}
9072
}
Lines 9110-9122 cat confdefs.h >>conftest.$ac_ext Link Here
9110
cat >>conftest.$ac_ext <<_ACEOF
9106
cat >>conftest.$ac_ext <<_ACEOF
9111
/* end confdefs.h.  */
9107
/* end confdefs.h.  */
9112
#define _LARGEFILE_SOURCE 1
9108
#define _LARGEFILE_SOURCE 1
9113
#include <sys/types.h> /* for off_t */
9109
#include <stdio.h>
9114
     #include <stdio.h>
9115
int
9110
int
9116
main ()
9111
main ()
9117
{
9112
{
9118
int (*fp) (FILE *, off_t, int) = fseeko;
9113
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
9119
     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
9120
  ;
9114
  ;
9121
  return 0;
9115
  return 0;
9122
}
9116
}
Lines 9777-9818 OBJDIR=$SRCDIR/"$ARCH"objs Link Here
9777
ELFDIR=$SRCDIR/elf"$ARCH"objs
9771
ELFDIR=$SRCDIR/elf"$ARCH"objs
9778
9772
9779
9773
9780
{ echo "$as_me:$LINENO: checking for Terminfo" >&5
9781
echo $ECHO_N "checking for Terminfo... $ECHO_C" >&6; }
9782
MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo"
9783
if test ! -d $MISC_TERMINFO_DIRS
9784
then
9785
   MISC_TERMINFO_DIRS=""
9786
fi
9787
9788
JD_Terminfo_Dirs="/usr/lib/terminfo \
9789
                 /usr/share/terminfo \
9790
                 /usr/share/lib/terminfo \
9791
		 /usr/local/lib/terminfo \
9792
		 $MISC_TERMINFO_DIRS"
9793
9794
TERMCAP=-ltermcap
9795
9796
for terminfo_dir in $JD_Terminfo_Dirs
9797
do
9798
   if test -d $terminfo_dir
9799
   then
9800
      { echo "$as_me:$LINENO: result: yes" >&5
9801
echo "${ECHO_T}yes" >&6; }
9802
      TERMCAP=""
9803
      break
9804
   fi
9805
done
9806
if test "$TERMCAP"; then
9807
  { echo "$as_me:$LINENO: result: no" >&5
9808
echo "${ECHO_T}no" >&6; }
9809
  cat >>confdefs.h <<\_ACEOF
9810
#define USE_TERMCAP 1
9811
_ACEOF
9812
9813
fi
9814
9815
9816
  if test "X$jd_prefix" = "X"
9774
  if test "X$jd_prefix" = "X"
9817
  then
9775
  then
9818
    jd_prefix=$ac_default_prefix
9776
    jd_prefix=$ac_default_prefix
Lines 10858-10865 X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim Link Here
10858
SRCDIR!$SRCDIR$ac_delim
10816
SRCDIR!$SRCDIR$ac_delim
10859
OBJDIR!$OBJDIR$ac_delim
10817
OBJDIR!$OBJDIR$ac_delim
10860
ELFDIR!$ELFDIR$ac_delim
10818
ELFDIR!$ELFDIR$ac_delim
10861
TERMCAP!$TERMCAP$ac_delim
10862
MISC_TERMINFO_DIRS!$MISC_TERMINFO_DIRS$ac_delim
10863
SLANG_LIB!$SLANG_LIB$ac_delim
10819
SLANG_LIB!$SLANG_LIB$ac_delim
10864
SLANG_INC!$SLANG_INC$ac_delim
10820
SLANG_INC!$SLANG_INC$ac_delim
10865
PROGRAM_OFILES!$PROGRAM_OFILES$ac_delim
10821
PROGRAM_OFILES!$PROGRAM_OFILES$ac_delim
Lines 10868-10876 PROGRAM_HFILES!$PROGRAM_HFILES$ac_delim Link Here
10868
PROGRAM_OBJECTS!$PROGRAM_OBJECTS$ac_delim
10824
PROGRAM_OBJECTS!$PROGRAM_OBJECTS$ac_delim
10869
PROGRAM_ELFOBJECTS!$PROGRAM_ELFOBJECTS$ac_delim
10825
PROGRAM_ELFOBJECTS!$PROGRAM_ELFOBJECTS$ac_delim
10870
LIBOBJS!$LIBOBJS$ac_delim
10826
LIBOBJS!$LIBOBJS$ac_delim
10827
LTLIBOBJS!$LTLIBOBJS$ac_delim
10871
_ACEOF
10828
_ACEOF
10872
10829
10873
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
10830
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
10874
    break
10831
    break
10875
  elif $ac_last_try; then
10832
  elif $ac_last_try; then
10876
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
10833
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Lines 10906-10955 CEOF$ac_eof Link Here
10906
_ACEOF
10863
_ACEOF
10907
10864
10908
10865
10909
ac_delim='%!_!# '
10910
for ac_last_try in false false false false false :; do
10911
  cat >conf$$subs.sed <<_ACEOF
10912
LTLIBOBJS!$LTLIBOBJS$ac_delim
10913
_ACEOF
10914
10915
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
10916
    break
10917
  elif $ac_last_try; then
10918
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
10919
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
10920
   { (exit 1); exit 1; }; }
10921
  else
10922
    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
10923
  fi
10924
done
10925
10926
ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
10927
if test -n "$ac_eof"; then
10928
  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
10929
  ac_eof=`expr $ac_eof + 1`
10930
fi
10931
10932
cat >>$CONFIG_STATUS <<_ACEOF
10933
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
10934
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
10935
_ACEOF
10936
sed '
10937
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
10938
s/^/s,@/; s/!/@,|#_!!_#|/
10939
:n
10940
t n
10941
s/'"$ac_delim"'$/,g/; t
10942
s/$/\\/; p
10943
N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
10944
' >>$CONFIG_STATUS <conf$$subs.sed
10945
rm -f conf$$subs.sed
10946
cat >>$CONFIG_STATUS <<_ACEOF
10947
:end
10948
s/|#_!!_#|//g
10949
CEOF$ac_eof
10950
_ACEOF
10951
10952
10953
# VPATH may cause trouble with some makes, so we remove $(srcdir),
10866
# VPATH may cause trouble with some makes, so we remove $(srcdir),
10954
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
10867
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
10955
# trailing colons and then remove the whole line if VPATH becomes empty
10868
# trailing colons and then remove the whole line if VPATH becomes empty
Lines 11193-11199 s&@abs_builddir@&$ac_abs_builddir&;t t Link Here
11193
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
11106
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
11194
s&@INSTALL@&$ac_INSTALL&;t t
11107
s&@INSTALL@&$ac_INSTALL&;t t
11195
$ac_datarootdir_hack
11108
$ac_datarootdir_hack
11196
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
11109
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
11197
11110
11198
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
11111
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
11199
  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
11112
  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
(-)most-5.0.0a/src/Makefile.in (-2 / +1 lines)
Lines 3-9 CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@ Link Here
3
LDFLAGS		= @LDFLAGS@
3
LDFLAGS		= @LDFLAGS@
4
SLANG_INC	= @SLANG_INC@
4
SLANG_INC	= @SLANG_INC@
5
SLANG_LIB	= @SLANG_LIB@ -lslang
5
SLANG_LIB	= @SLANG_LIB@ -lslang
6
MISCLIBS	= @TERMCAP@
7
RPATH		= @RPATH@
6
RPATH		= @RPATH@
8
7
9
#-----------------------------------------------------------------------------
8
#-----------------------------------------------------------------------------
Lines 44-50 EXEC = most Link Here
44
CONFIG_H = config.h
43
CONFIG_H = config.h
45
INCS = $(SLANG_INC)
44
INCS = $(SLANG_INC)
46
ALL_CFLAGS = $(CFLAGS) -Dunix $(INCS)
45
ALL_CFLAGS = $(CFLAGS) -Dunix $(INCS)
47
EXECLIBS = $(RPATH) $(SLANG_LIB) $(MISCLIBS) -lm
46
EXECLIBS = $(RPATH) $(SLANG_LIB) -lm
48
#
47
#
49
most_O_DEP = $(SRCDIR)/version.h
48
most_O_DEP = $(SRCDIR)/version.h
50
UPDATE_VERSION_SCRIPT = $(HOME)/bin/update_changes_version
49
UPDATE_VERSION_SCRIPT = $(HOME)/bin/update_changes_version

Return to bug 531958