Fix to allow commandline options.

PR:		9553
Submitted by:	maintainer

2 files changed, 207 insertions, 21 deletions

diff --git a/misc/pdmenu/files/patch-aa b/misc/pdmenu/files/patch-aa
index 0798dde11eda..5dbf4668ecff 100644
--- a/misc/pdmenu/files/patch-aa
+++ b/misc/pdmenu/files/patch-aa
@@ -1,11 +1,58 @@
---- configure.in.orig	Sat Jan  9 14:08:32 1999
-+++ configure.in	Sat Jan  9 14:10:14 1999
-@@ -46,7 +46,7 @@
- dnl The function we check for in libslang is important, because
- dnl we need to make sure we have the right version of slang.
- AC_CHECK_LIB(slang, SLsig_block_signals,, 
--	AC_MSG_ERROR(can't find required slang library or library is obsolete. Try setting the SLANG_LIB_LOC environment variable to point to the directory containing the slang library.))
-+	AC_MSG_ERROR(can't find required slang library or library is obsolete. Try setting the SLANG_LIB_LOC environment variable to point to the directory containing the slang library.),-ltermcap)
+--- configure.in.orig	Thu Jan 14 17:49:38 1999
++++ configure.in	Thu Jan 14 17:50:06 1999
+@@ -36,6 +36,27 @@
+ rmdir ./test/test2 2>/dev/null
+ rmdir ./test 2>/dev/null
  
- dnl Checks for header files.
- AC_HEADER_STDC
++dnl If we cannot find terminfo, link with termcap.
++Terminfo_Dirs="/usr/lib/terminfo \
++	/usr/share/lib/terminfo \
++	/usr/local/lib/terminfo"
++TERMCAP=yes
++AC_MSG_CHECKING(for terminfo)
++for terminfo_dir in $Terminfo_Dirs
++do
++	if test -d $terminfo_dir; then
++		AC_MSG_RESULT(found)
++		TERMCAP=""
++		break
++	fi
++done
++if test "$TERMCAP"; then
++	AC_MSG_RESULT(not found)
++	AC_CHECK_LIB(termcap,tgetent)
++	# Note that if this fails, we continue and make probably dies with
++	# an error. Unless terminfo is hiding somewhere else..
++fi
++
+ dnl Let the user specify an alternate location for the libs.
+ dnl I have to add this to CFLAGS, instead of to LIBS, to placate 
+ dnl some compiler that wanted -L before -l .
+@@ -96,27 +117,6 @@
+ 	fi
+ else
+ 	AC_MSG_WARN(pdmenu will be built without GPM mouse support.)
+-fi
+-
+-dnl If we cannot find terminfo, link with termcap.
+-Terminfo_Dirs="/usr/lib/terminfo \
+-	/usr/share/lib/terminfo \
+-	/usr/local/lib/terminfo"
+-TERMCAP=yes
+-AC_MSG_CHECKING(for terminfo)
+-for terminfo_dir in $Terminfo_Dirs
+-do
+-	if test -d $terminfo_dir; then
+-		AC_MSG_RESULT(found)
+-		TERMCAP=""
+-		break
+-	fi
+-done
+-if test "$TERMCAP"; then
+-	AC_MSG_RESULT(not found)
+-	AC_CHECK_LIB(termcap,tgetent)
+-	# Note that if this fails, we continue and make probably dies with
+-	# an error. Unless terminfo is hiding somewhere else..
+ fi
+ 
+ AC_CHECK_PROG(DATE_PROG,date,yes,no)
diff --git a/misc/pdmenu/files/patch-ab b/misc/pdmenu/files/patch-ab
index 7871fd2a6aa2..70a965af981d 100644
--- a/misc/pdmenu/files/patch-ab
+++ b/misc/pdmenu/files/patch-ab
@@ -1,11 +1,150 @@
---- configure.orig	Sat Jan  9 14:08:55 1999
-+++ configure	Sat Jan  9 14:10:24 1999
-@@ -842,7 +842,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lslang  $LIBS"
-+LIBS="-lslang -ltermcap $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 848 "configure"
- #include "confdefs.h"
+*** configure.orig	Thu Jan 14 17:49:33 1999
+--- configure	Thu Jan 14 17:50:19 1999
+***************
+*** 832,835 ****
+--- 832,902 ----
+  rmdir ./test 2>/dev/null
+  
++ Terminfo_Dirs="/usr/lib/terminfo \
++ 	/usr/share/lib/terminfo \
++ 	/usr/local/lib/terminfo"
++ TERMCAP=yes
++ echo $ac_n "checking for terminfo""... $ac_c" 1>&6
++ echo "configure:840: checking for terminfo" >&5
++ for terminfo_dir in $Terminfo_Dirs
++ do
++ 	if test -d $terminfo_dir; then
++ 		echo "$ac_t""found" 1>&6
++ 		TERMCAP=""
++ 		break
++ 	fi
++ done
++ if test "$TERMCAP"; then
++ 	echo "$ac_t""not found" 1>&6
++ 	echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
++ echo "configure:852: checking for tgetent in -ltermcap" >&5
++ ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++   echo $ac_n "(cached) $ac_c" 1>&6
++ else
++   ac_save_LIBS="$LIBS"
++ LIBS="-ltermcap  $LIBS"
++ cat > conftest.$ac_ext <<EOF
++ #line 860 "configure"
++ #include "confdefs.h"
++ /* Override any gcc2 internal prototype to avoid an error.  */
++ /* We use char because int might match the return type of a gcc2
++     builtin and then its argument prototype would still apply.  */
++ char tgetent();
++ 
++ int main() {
++ tgetent()
++ ; return 0; }
++ EOF
++ if { (eval echo configure:871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++   rm -rf conftest*
++   eval "ac_cv_lib_$ac_lib_var=yes"
++ else
++   echo "configure: failed program was:" >&5
++   cat conftest.$ac_ext >&5
++   rm -rf conftest*
++   eval "ac_cv_lib_$ac_lib_var=no"
++ fi
++ rm -f conftest*
++ LIBS="$ac_save_LIBS"
++ 
++ fi
++ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++   echo "$ac_t""yes" 1>&6
++     ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++   cat >> confdefs.h <<EOF
++ #define $ac_tr_lib 1
++ EOF
++ 
++   LIBS="-ltermcap $LIBS"
++ 
++ else
++   echo "$ac_t""no" 1>&6
++ fi
++ 
++ 	# Note that if this fails, we continue and make probably dies with
++ 	# an error. Unless terminfo is hiding somewhere else..
++ fi
++ 
+  if test "$SLANG_LIB_LOC" != "" ; then 
+  	CFLAGS="-L$SLANG_LIB_LOC $CFLAGS"
+***************
+*** 1679,1749 ****
+  else
+  	echo "configure: warning: pdmenu will be built without GPM mouse support." 1>&2
+- fi
+- 
+- Terminfo_Dirs="/usr/lib/terminfo \
+- 	/usr/share/lib/terminfo \
+- 	/usr/local/lib/terminfo"
+- TERMCAP=yes
+- echo $ac_n "checking for terminfo""... $ac_c" 1>&6
+- echo "configure:1689: checking for terminfo" >&5
+- for terminfo_dir in $Terminfo_Dirs
+- do
+- 	if test -d $terminfo_dir; then
+- 		echo "$ac_t""found" 1>&6
+- 		TERMCAP=""
+- 		break
+- 	fi
+- done
+- if test "$TERMCAP"; then
+- 	echo "$ac_t""not found" 1>&6
+- 	echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+- echo "configure:1701: checking for tgetent in -ltermcap" >&5
+- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
+- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-   echo $ac_n "(cached) $ac_c" 1>&6
+- else
+-   ac_save_LIBS="$LIBS"
+- LIBS="-ltermcap  $LIBS"
+- cat > conftest.$ac_ext <<EOF
+- #line 1709 "configure"
+- #include "confdefs.h"
+- /* Override any gcc2 internal prototype to avoid an error.  */
+- /* We use char because int might match the return type of a gcc2
+-     builtin and then its argument prototype would still apply.  */
+- char tgetent();
+- 
+- int main() {
+- tgetent()
+- ; return 0; }
+- EOF
+- if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-   rm -rf conftest*
+-   eval "ac_cv_lib_$ac_lib_var=yes"
+- else
+-   echo "configure: failed program was:" >&5
+-   cat conftest.$ac_ext >&5
+-   rm -rf conftest*
+-   eval "ac_cv_lib_$ac_lib_var=no"
+- fi
+- rm -f conftest*
+- LIBS="$ac_save_LIBS"
+- 
+- fi
+- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-   echo "$ac_t""yes" 1>&6
+-     ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-   cat >> confdefs.h <<EOF
+- #define $ac_tr_lib 1
+- EOF
+- 
+-   LIBS="-ltermcap $LIBS"
+- 
+- else
+-   echo "$ac_t""no" 1>&6
+- fi
+- 
+- 	# Note that if this fails, we continue and make probably dies with
+- 	# an error. Unless terminfo is hiding somewhere else..
+  fi
+  
+--- 1746,1749 ----