58 lines
1.7 KiB
Text
58 lines
1.7 KiB
Text
$NetBSD: patch-aa,v 1.2 2008/02/25 16:45:44 jlam Exp $
|
|
|
|
--- configure.orig 2007-06-23 18:53:15.000000000 -0400
|
|
+++ configure
|
|
@@ -4685,6 +4685,7 @@ for ac_dir in $mh_inc_dirs ; do
|
|
break
|
|
fi
|
|
done
|
|
+mh_x11_dir="${X11BASE}/include/X11"
|
|
|
|
|
|
if test "$with_xaw3d" = yes; then
|
|
@@ -4706,6 +4707,7 @@ for ac_dir in $mh_inc_dirs ; do
|
|
break
|
|
fi
|
|
done
|
|
+mh_x11_xaw_dir="${X11BASE}/include/X11"
|
|
|
|
if test "x$mh_x11_dir" != "x" ; then
|
|
mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'`
|
|
@@ -4770,6 +4772,7 @@ else
|
|
MH_X11_LIBS="Xaw Xmu Xt X11"
|
|
fi
|
|
fi
|
|
+MH_X11_LIBS="${PDCURSES_XAW} Xmu Xt X11"
|
|
MH_X11R6_LIBS="SM ICE Xext"
|
|
mh_x11r6=no
|
|
|
|
@@ -4797,27 +4800,8 @@ mh_where_found=""
|
|
mh_where_found_dirs=""
|
|
mh_solaris_path=""
|
|
for mh_lib in $mh_libs; do
|
|
- mh_lib_found=no
|
|
- for ac_dir in $mh_lib_dirs ; do
|
|
- for mh_ext in a so sl dll.a; do
|
|
- if test -r $ac_dir/lib$mh_lib.$mh_ext; then
|
|
- if test "x$mh_prev_dir" != "x$ac_dir" ; then
|
|
- if test "x$mh_prev_dir" = "x" ; then
|
|
- mh_where_found="$mh_where_found found in $ac_dir"
|
|
- else
|
|
- mh_where_found="$mh_where_found and in $ac_dir"
|
|
- fi
|
|
- mh_prev_dir=$ac_dir
|
|
- mh_where_found_dirs="$mh_where_found_dirs $ac_dir"
|
|
- MH_XLIBS="$MH_XLIBS -L$ac_dir"
|
|
- mh_solaris_path="${mh_solaris_path}:$ac_dir"
|
|
- fi
|
|
- MH_XLIBS="$MH_XLIBS -l$mh_lib"
|
|
- mh_lib_found=yes
|
|
- break 2
|
|
- fi
|
|
- done
|
|
- done
|
|
+ mh_lib_found=yes
|
|
+ MH_XLIBS="$MH_XLIBS -l$mh_lib"
|
|
if test "$mh_lib_found" = no; then
|
|
{ { echo "$as_me:$LINENO: error: Cannot find required X library; lib$mh_lib. PDCurses cannot be configured" >&5
|
|
echo "$as_me: error: Cannot find required X library; lib$mh_lib. PDCurses cannot be configured" >&2;}
|