diff options
Diffstat (limited to 'mbone/rtpmon/files/patch-aa')
-rw-r--r-- | mbone/rtpmon/files/patch-aa | 302 |
1 files changed, 265 insertions, 37 deletions
diff --git a/mbone/rtpmon/files/patch-aa b/mbone/rtpmon/files/patch-aa index 39dbb2a57514..f794feddf129 100644 --- a/mbone/rtpmon/files/patch-aa +++ b/mbone/rtpmon/files/patch-aa @@ -1,40 +1,268 @@ ---- configure.in.orig Wed Jan 15 14:44:04 1997 -+++ configure.in Wed Sep 24 17:09:03 1997 -@@ -109,6 +109,7 @@ - /usr/src/tcl7.6/generic \ - /usr/local/src/tcl7.6/generic \ - /usr/src/local/tcl7.6/generic \ -+ /usr/local/include/tcl7.6 \ - ../tcl7.5/generic \ - /usr/src/tcl7.5/generic \ - /usr/local/src/tcl7.5/generic \ -@@ -189,6 +190,10 @@ - AC_MSG_RESULT($place/libtcl7.6.a) +--- configure.in.orig Wed Jan 15 16:44:04 1997 ++++ configure.in Tue Nov 2 17:36:27 1999 +@@ -89,35 +89,8 @@ + found_tcl_h="no" + libtcl="no" + +-AC_ARG_WITH(tcl, --with-tcl=path Specify a path for Tcl, dir=$withval, dir="none") +- +-if test "$dir" = "none" ; then +- AC_CHECK_HEADER(tcl.h, found_tcl_h="yes", found_tcl_h="no") +- AC_CHECK_LIB(tcl7.6, Tcl_Init, libtcl="-ltcl7.6", libtcl="no") +- if test "$libtcl" = "no" ; then +- AC_CHECK_LIB(tcl7.5, Tcl_Init, libtcl="-ltcl7.5", libtcl="no") +- fi +- if test "$libtcl" = "no" ; then +- AC_CHECK_LIB(tcl, Tcl_Init, libtcl="-ltcl", libtcl="no") +- fi +-fi +- +-if test "$found_tcl_h" = "no" ; then + AC_MSG_CHECKING(for tcl.h) +- places="$dir/include \ +- ../tcl7.6/generic \ +- /usr/src/tcl7.6/generic \ +- /usr/local/src/tcl7.6/generic \ +- /usr/src/local/tcl7.6/generic \ +- ../tcl7.5/generic \ +- /usr/src/tcl7.5/generic \ +- /usr/local/src/tcl7.5/generic \ +- /usr/src/local/tcl7.5/generic \ +- /usr/include \ +- /usr/local/include \ +- /usr/contrib/include \ +- $prefix/include \ +- $x_includes" ++ places="/usr/local/include/tcl8.2" + + for place in $places ; do + if test -r $place/tcl.h ; then +@@ -136,22 +109,10 @@ + AC_MSG_RESULT(nope) + AC_MSG_ERROR([Can't find tcl.h. Try the --with-tcl option.]) + fi +-fi + +-if test "$libtcl" = "no" ; then + AC_MSG_CHECKING(for libtcl) + places="$dir/lib \ +- ../tcl7.6/unix \ +- /usr/src/tcl7.6/unix \ +- /usr/local/src/tcl7.6/unix \ +- /usr/src/local/tcl7.6/unix \ +- ../tcl7.5/unix \ +- /usr/src/tcl7.5/unix \ +- /usr/local/src/tcl7.5/unix \ +- /usr/src/local/tcl7.5/unix \ +- /usr/lib \ + /usr/local/lib \ +- /usr/contrib/lib \ + $prefix/lib \ + $x_libraries" + +@@ -185,18 +146,10 @@ + fi + + if test "$libtcl" = "no" ; then +- if test -r $place/libtcl7.6.a ; then +- AC_MSG_RESULT($place/libtcl7.6.a) +- LDFLAGS="$LDFLAGS -L$place" +- libtcl="-ltcl7.6" +- elif test -r $place/libtcl7.5.a ; then +- AC_MSG_RESULT($place/libtcl7.5.a) +- LDFLAGS="$LDFLAGS -L$place" +- libtcl="-ltcl7.5" +- elif test -r $place/libtcl.a ; then +- AC_MSG_RESULT($place/libtcl.a) ++ if test -r $place/libtcl82.a ; then ++ AC_MSG_RESULT($place/libtcl82.a) LDFLAGS="$LDFLAGS -L$place" - libtcl="-ltcl7.6" -+ elif test -r $place/libtcl76.a ; then -+ AC_MSG_RESULT($place/libtcl7.6.a) -+ LDFLAGS="$LDFLAGS -L$place" -+ libtcl="-ltcl76" - elif test -r $place/libtcl7.5.a ; then - AC_MSG_RESULT($place/libtcl7.5.a) - LDFLAGS="$LDFLAGS -L$place" -@@ -287,6 +292,7 @@ - if test "$found_tk_h" = "no" ; then +- libtcl="-ltcl" ++ libtcl="-ltcl82" + fi + fi + +@@ -209,40 +162,10 @@ + AC_MSG_RESULT(nope) + AC_MSG_ERROR([Can't find libtcl. Try the --with-tcl option.]) + fi +-fi + + found_init_tcl="no" + AC_MSG_CHECKING(for Tcl runtime libraries) +-places="$dir/lib/tcl7.6 \ +- $dir/share/lib/tcl7.6 \ +- ../tcl7.6/library \ +- /usr/src/tcl7.6/library \ +- /usr/local/src/tcl7.6/library \ +- /usr/src/local/tcl7.6/library \ +- /usr/lib/tcl7.6 \ +- /usr/share/lib/tcl7.6 \ +- /usr/local/lib/tcl7.6 \ +- /usr/local/share/lib/tcl7.6 \ +- /usr/contrib/lib/tcl7.6 \ +- /usr/contrib/share/lib/tcl7.6 \ +- $prefix/lib/tcl7.6 \ +- $prefix/share/lib/tcl7.6 \ +- $x_libraries/tcl7.6 \ +- $dir/lib/tcl7.5 \ +- $dir/share/lib/tcl7.5 \ +- ../tcl7.5/library \ +- /usr/src/tcl7.5/library \ +- /usr/local/src/tcl7.5/library \ +- /usr/src/local/tcl7.5/library \ +- /usr/lib/tcl7.5 \ +- /usr/share/lib/tcl7.5 \ +- /usr/local/lib/tcl7.5 \ +- /usr/local/share/lib/tcl7.5 \ +- /usr/contrib/lib/tcl7.5 \ +- /usr/contrib/share/lib/tcl7.5 \ +- $prefix/lib/tcl7.5 \ +- $prefix/share/lib/tcl7.5 \ +- $x_libraries/tcl7.5" ++places="/usr/local/lib/tcl8.2" + + for place in $places; do + if test -r $place/init.tcl ; then +@@ -263,39 +186,8 @@ + found_tk_h="no" + libtk="no" + +-AC_ARG_WITH(tk, --with-tk=path Specify a path for Tk, dir=$withval, dir="none") +- +-if test "$dir" = "none" ; then +- AC_CHECK_HEADER(tk.h, found_tk_h="yes", found_tk_h="no") +- if test "$sunos" = 1 ; then +- AC_CHECK_LIB(tk42, Tk_Init, libtk="-ltk42", libtk="no") +- if test "$libtk" = "no" ; then +- AC_CHECK_LIB(tk41, Tk_Init, libtk="-ltk41", libtk="no") +- fi +- else +- AC_CHECK_LIB(tk4.2, Tk_init, libtk="-ltk4.2", libtk="no") +- if test "$libtk" = "no" ; then +- AC_CHECK_LIB(tk4.1, Tk_Init, libtk="-ltk4.1", libtk="no") +- fi +- fi +- +- if test "$libtk" = "no" ; then +- AC_CHECK_LIB(tk, Tk_Init, libtk="-ltk", libtk="no") +- fi +-fi +- +-if test "$found_tk_h" = "no" ; then AC_MSG_CHECKING(for tk.h) - places="$dir/include \ -+ /usr/local/include/tk4.2 \ - ../tk4.1/generic \ - /usr/src/tk4.1/generic \ - /usr/local/src/tk4.1/generic \ -@@ -349,6 +355,10 @@ - AC_MSG_RESULT($place/libtk4.2.a) - LDFLAGS="$LDFLAGS -L$place" - libtk="-ltk4.2" -+ elif test -r $place/libtk42.a ; then -+ AC_MSG_RESULT($place/libtk42.a) -+ LDFLAGS="$LDFLAGS -L$place" -+ libtk="-ltk42" - elif test -r $place/libtk4.1.a ; then - AC_MSG_RESULT($place/libtk4.1.a) +- places="$dir/include \ +- ../tk4.1/generic \ +- /usr/src/tk4.1/generic \ +- /usr/local/src/tk4.1/generic \ +- /usr/src/local/tk4.1/generic \ +- /usr/include \ +- /usr/local/include \ +- /usr/contrib/include \ +- $prefix/include \ +- $x_includes" ++ places="/usr/local/include/tk8.2" + + for place in $places; do + if test -r $place/tk.h ; then +@@ -310,55 +202,19 @@ + AC_MSG_RESULT(nope) + AC_MSG_ERROR([Can't find tk.h. Try the --with-tk option.]) + fi +-fi + +-if test "$libtk" = "no" ; then + AC_MSG_CHECKING(for libtk) + places="$dir/lib \ +- ../tk4.1/unix \ +- /usr/src/tk4.1/unix \ +- /usr/local/src/tk4.1/unix \ +- /usr/src/local/tk4.1/unix \ +- /usr/lib \ + /usr/local/lib \ +- /usr/contrib/lib \ + $prefix/lib \ + $x_libraries" + + for place in $places; do +- if test "$solaris" = 1 ; then +- if test -r $place/libtk4.1.so ; then +- AC_MSG_RESULT($place/libtk4.1.so) +- LDFLAGS="$LDFLAGS -R$place -L$place" +- libtk="-ltk4.1" +- elif test -r $place/libtk.so ; then +- AC_MSG_RESULT($place/libtk.so) +- LDFLAGS="$LDFLAGS -R$place -L$place" +- libtk="-ltk" +- fi +- fi +- +- if test "$sunos" = 1 -a -r $place/libtk41.a ; then +- AC_MSG_RESULT($place/libtk41.a) +- LDFLAGS="$LDFLAGS -L$place" +- libtk="-ltk41" +- fi +- +- if test "$libtk" = "no" ; then +- if test -r $place/libtk4.2.a ; then +- AC_MSG_RESULT($place/libtk4.2.a) ++ if test -r $place/libtk82.a ; then ++ AC_MSG_RESULT($place/libtk82.a) LDFLAGS="$LDFLAGS -L$place" +- libtk="-ltk4.2" +- elif test -r $place/libtk4.1.a ; then +- AC_MSG_RESULT($place/libtk4.1.a) +- LDFLAGS="$LDFLAGS -L$place" +- libtk="-ltk4.1" +- elif test -r $place/libtk.a ; then +- AC_MSG_RESULT($place/libtk.a) +- LDFLAGS="$LDFLAGS -L$place" +- libtk="-ltk" ++ libtk="-ltk82" + fi +- fi + + if test "$libtk" != "no" ; then + break +@@ -373,40 +229,10 @@ + AC_MSG_RESULT(nope) + AC_MSG_ERROR([Can't find libtk. Try the --with-tk option.]) + fi +-fi + + found_tk_tcl="no" + AC_MSG_CHECKING(for Tk runtime libraries) +-places="$dir/lib/tk4.2 \ +- $dir/share/lib/tk4.2 \ +- ../tk4.2/library \ +- /usr/src/tk4.2/library \ +- /usr/local/src/tk4.2/library \ +- /usr/src/local/tk4.2/library \ +- /usr/lib/tk4.2 \ +- /usr/share/lib/tk4.2 \ +- /usr/local/lib/tk4.2 \ +- /usr/local/share/lib/tk4.2 \ +- /usr/contrib/lib/tk4.2 \ +- /usr/contrib/share/lib/tk4.2 \ +- $prefix/lib/tk4.2 \ +- $prefix/share/lib/tk4.2 \ +- $x_libraries/tk4.2 \ +- $dir/lib/tk4.1 \ +- $dir/share/lib/tk4.1 \ +- ../tk4.1/library \ +- /usr/src/tk4.1/library \ +- /usr/local/src/tk4.1/library \ +- /usr/src/local/tk4.1/library \ +- /usr/lib/tk4.1 \ +- /usr/share/lib/tk4.1 \ +- /usr/local/lib/tk4.1 \ +- /usr/local/share/lib/tk4.1 \ +- /usr/contrib/lib/tk4.1 \ +- /usr/contrib/share/lib/tk4.1 \ +- $prefix/lib/tk4.1 \ +- $prefix/share/lib/tk4.1 \ +- $x_libraries/tk4.1" ++places="/usr/local/lib/tk8.2" + + for place in $places; do + if test -r $place/tk.tcl ; then |