hand apply whitespace mutiliated patch

[p5sagit/p5-mst-13.2.git] / Configure

diff --git a/Configure b/Configure
index 307f250..ffd7e08 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -147,6 +147,7 @@ dynamic_ext=''
 extensions=''
 known_extensions=''
 static_ext=''
+nonxs_ext=''
 useopcode=''
 useposix=''
 d_bsd=''
@@ -375,6 +376,7 @@ d_memmove=''
 d_memset=''
 d_mkdir=''
 d_mkfifo=''
+d_mknod=''
 d_mktime=''
 d_msg=''
 d_msgctl=''
@@ -588,6 +590,7 @@ plibpth=''
 xlibpth=''
 libs=''
 lns=''
+devtype=''
 lseektype=''
 make_set_make=''
 d_mymalloc=''
@@ -7396,6 +7399,10 @@ eval $inlibc
 set mkfifo d_mkfifo
 eval $inlibc
 
+: see if mknod exists
+set mknod d_mknod
+eval $inlibc
+
 : see if mktime exists
 set mktime d_mktime
 eval $inlibc
@@ -9473,6 +9480,11 @@ EOM
 *)  groupstype="$gidtype";;
 esac
 
+: see what type is used for devices
+rp="What is the type used for device numbers on this system?"
+set dev_t devtype long stdio.h sys/types.h
+eval $typedef_ask
+
 : see what type lseek is declared as in the kernel
 rp="What is the type used for lseek's offset on this system?"
 set off_t lseektype long stdio.h sys/types.h
@@ -10867,6 +10879,7 @@ cd $rsrc/ext
 : If we are using the old config.sh, known_extensions may contain
 : old or inaccurate or duplicate values.
 known_extensions=''
+nonxs_extensions=''
 : We do not use find because it might not be available.
 : We do not just use MANIFEST because the user may have dropped
 : some additional extensions into the source tree and expect them
@@ -10879,17 +10892,27 @@ for xxx in * ; do
                else
                        if $test -d $xxx; then
                                cd $xxx
+                               zzz=$known_extensions
                                for yyy in * ; do
                                if $test -f $yyy/$yyy.xs; then
                                        known_extensions="$known_extensions $xxx/$yyy"
                                fi
                                done
                                cd ..
+                               if $test "$zzz" = "$known_extensions"; then
+                                       if $test -f $xxx/Makefile.PL; then
+                                               known_extensions="$known_extensions $xxx"
+                                               nonxs_extensions="$nonxs_extensions $xxx"
+                                       fi
+                               fi
                        fi
                fi 
                ;;
        esac
 done
+set X $nonxs_extensions
+shift
+nonxs_extensions="$*"
 set X $known_extensions
 shift
 known_extensions="$*"
@@ -10939,7 +10962,11 @@ for xxx in $known_extensions ; do
                true|$define|y) avail_ext="$avail_ext $xxx" ;;
                esac
                ;;
-       *)      avail_ext="$avail_ext $xxx"
+       *)
+               case " $nonxs_extensions " in
+               *" $xxx "*) ;;
+               *) avail_ext="$avail_ext $xxx" ;;
+               esac
                ;;
        esac
 done
@@ -10948,6 +10975,19 @@ set X $avail_ext
 shift
 avail_ext="$*"
 
+: Now see which nonxs extensions are supported on this system.
+nonxs_ext=''
+for xxx in $nonxs_extensions ; do
+       case "$xxx" in
+       *)      nonxs_ext="$nonxs_ext $xxx"
+               ;;
+       esac
+done
+
+set X $nonxs_ext
+shift
+nonxs_ext="$*"
+
 case $usedl in
 $define)
        $cat <<EOM
@@ -10978,6 +11018,7 @@ EOM
                esac
                ;;
        esac
+       : Exclude those that are not xs extensions
        case "$dflt" in
        '')     dflt=none;;
        esac
@@ -10993,7 +11034,7 @@ EOM
                : Exclude those already listed in dynamic linking
                dflt=''
                for xxx in $avail_ext; do
-                       case " $dynamic_ext " in
+                       case " $dynamic_ext $nonxs_ext " in
                        *" $xxx "*) ;;
                        *) dflt="$dflt $xxx" ;;
                        esac
@@ -11282,6 +11323,7 @@ d_memmove='$d_memmove'
 d_memset='$d_memset'
 d_mkdir='$d_mkdir'
 d_mkfifo='$d_mkfifo'
+d_mknod='$d_mknod'
 d_mktime='$d_mktime'
 d_msg='$d_msg'
 d_msgctl='$d_msgctl'
@@ -11403,6 +11445,7 @@ date='$date'
 db_hashtype='$db_hashtype'
 db_prefixtype='$db_prefixtype'
 defvoidused='$defvoidused'
+devtype='$devtype'
 direntrytype='$direntrytype'
 dlext='$dlext'
 dlsrc='$dlsrc'
@@ -11574,6 +11617,7 @@ path_sep='$path_sep'
 perl='$perl'
 perladmin='$perladmin'
 perlpath='$perlpath'
+nonxs_ext='$nonxs_ext'
 pg='$pg'
 phostname='$phostname'
 pidtype='$pidtype'