Probe for <sys/utsname.h>.

p4raw-id: //depot/cfgperl@5115

diff --git a/Configure b/Configure
index dcf088c..28d19d6 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Feb 15 03:52:41 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Wed Feb 16 01:07:15 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -666,6 +666,7 @@ i_systimes=''
 i_systypes=''
 i_sysuio=''
 i_sysun=''
+i_sysutsname=''
 i_sysvfs=''
 i_syswait=''
 i_sgtty=''
@@ -14125,6 +14126,11 @@ eval $inhdr
 set sys/un.h i_sysun
 eval $inhdr
 
+
+: see if this is a sys/utsname.h system
+set sys/utsname.h i_sysutsname
+eval $inhdr
+
 : see if this is a syswait system
 set sys/wait.h i_syswait
 eval $inhdr
@@ -14959,6 +14965,7 @@ i_systimes='$i_systimes'
 i_systypes='$i_systypes'
 i_sysuio='$i_sysuio'
 i_sysun='$i_sysun'
+i_sysutsname='$i_sysutsname'
 i_sysvfs='$i_sysvfs'
 i_syswait='$i_syswait'
 i_termio='$i_termio'

diff --git a/Porting/Glossary b/Porting/Glossary
index 44012c4..73b0f1e 100644 (file)
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -2116,6 +2116,10 @@ i_sysun (i_sysun.U):
        to the C program that it should include <sys/un.h> to get UNIX
        domain socket definitions.
 
+i_sysutsname (i_sysutsname.U):
+       This variable conditionally defines the I_SYSUTSNAME symbol,
+       and indicates whether a C program should include <sys/utsname.h>.
+
 i_sysvfs (i_sysvfs.U):
        This variable conditionally defines the I_SYSVFS symbol,
        and indicates whether a C program should include <sys/vfs.h>.

diff --git a/Porting/config.sh b/Porting/config.sh
index f21eb39..9d3d8c1 100644 (file)
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Sat Feb 12 01:09:19 EET 2000
+# Configuration time: Wed Feb 16 01:08:43 EET 2000
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -35,8 +35,8 @@ api_subversion='0'
 api_version='5'
 api_versionstring='5.005'
 ar='ar'
-archlib='/opt/perl/lib/5.5.650/alpha-dec_osf-thread-multi'
-archlibexp='/opt/perl/lib/5.5.650/alpha-dec_osf-thread-multi'
+archlib='/opt/perl/lib/5.5.660/alpha-dec_osf-thread-multi'
+archlibexp='/opt/perl/lib/5.5.660/alpha-dec_osf-thread-multi'
 archname64=''
 archname='alpha-dec_osf-thread-multi'
 archobjs=''
@@ -54,12 +54,12 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags=' '
-ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.5.650/alpha-dec_osf-thread-multi/CORE'
+ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.5.660/alpha-dec_osf-thread-multi/CORE'
 ccflags='-pthread -std -DLANGUAGE_C'
 ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_BSD=1 SYSTYPE_BSD=1 unix=1'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Sat Feb 12 01:09:19 EET 2000'
+cf_time='Wed Feb 16 01:08:43 EET 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -377,7 +377,7 @@ dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
-dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Syslog Thread attrs re'
+dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -386,7 +386,7 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Syslog Thread attrs re Errno'
+extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re Errno'
 fflushNULL='define'
 fflushall='undef'
 find=''
@@ -482,6 +482,7 @@ i_systimes='define'
 i_systypes='define'
 i_sysuio='define'
 i_sysun='define'
+i_sysutsname='define'
 i_sysvfs='undef'
 i_syswait='define'
 i_termio='undef'
@@ -499,17 +500,17 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/opt/perl/lib/5.5.650/alpha-dec_osf-thread-multi'
+installarchlib='/opt/perl/lib/5.5.660/alpha-dec_osf-thread-multi'
 installbin='/opt/perl/bin'
 installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.5.650'
+installprivlib='/opt/perl/lib/5.5.660'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.5.650/alpha-dec_osf-thread-multi'
+installsitearch='/opt/perl/lib/site_perl/5.5.660/alpha-dec_osf-thread-multi'
 installsitebin='/opt/perl/bin'
-installsitelib='/opt/perl/lib/site_perl/5.5.650'
+installsitelib='/opt/perl/lib/site_perl/5.5.660'
 installstyle='lib'
 installusrbinperl='define'
 installvendorbin=''
@@ -518,7 +519,7 @@ intsize='4'
 ivdformat='"ld"'
 ivsize='8'
 ivtype='long'
-known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Syslog Thread attrs re'
+known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re'
 ksh=''
 large=''
 ld='ld'
@@ -612,8 +613,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.5.650'
-privlibexp='/opt/perl/lib/5.5.650'
+privlib='/opt/perl/lib/5.5.660'
+privlibexp='/opt/perl/lib/5.5.660'
 prototype='define'
 ptrsize='8'
 quadkind='2'
@@ -659,12 +660,12 @@ sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE"
 sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 6 6 16 20 23 23 23 29 48 '
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 6, 6, 16, 20, 23, 23, 23, 29, 48, 0'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/5.5.650/alpha-dec_osf-thread-multi'
-sitearchexp='/opt/perl/lib/site_perl/5.5.650/alpha-dec_osf-thread-multi'
+sitearch='/opt/perl/lib/site_perl/5.5.660/alpha-dec_osf-thread-multi'
+sitearchexp='/opt/perl/lib/site_perl/5.5.660/alpha-dec_osf-thread-multi'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
-sitelib='/opt/perl/lib/site_perl/5.5.650'
-sitelibexp='/opt/perl/lib/site_perl/5.5.650'
+sitelib='/opt/perl/lib/site_perl/5.5.660'
+sitelibexp='/opt/perl/lib/site_perl/5.5.660'
 siteprefix='/opt/perl'
 siteprefixexp='/opt/perl'
 sizetype='size_t'
@@ -692,7 +693,7 @@ stdio_ptr='((fp)->_ptr)'
 stdio_stream_array='_iob'
 strings='/usr/include/string.h'
 submit=''
-subversion='650'
+subversion='660'
 sysman='/usr/man/man1'
 tail=''
 tar=''
@@ -752,11 +753,11 @@ vendorlib=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.5.650'
+version='5.5.660'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.5.650'
+xs_apiversion='5.5.660'
 zcat=''
 zip='zip'
 # Configure command line arguments.
@@ -776,7 +777,7 @@ config_arg10='-Dmyhostname=yourhost'
 config_arg11='-dE'
 PERL_REVISION=5
 PERL_VERSION=5
-PERL_SUBVERSION=650
+PERL_SUBVERSION=660
 PERL_API_REVISION=5
 PERL_API_VERSION=5
 PERL_API_SUBVERSION=0

diff --git a/Porting/config_H b/Porting/config_H
index 4c41d24..39ca93c 100644 (file)
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Sat Feb 12 01:09:19 EET 2000
+ * Configuration time: Wed Feb 16 01:08:43 EET 2000
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1098,8 +1098,8 @@
  *     This symbol contains the ~name expanded version of ARCHLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "/opt/perl/lib/5.5.650/alpha-dec_osf-thread-multi"             /**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.5.650/alpha-dec_osf-thread-multi"         /**/
+#define ARCHLIB "/opt/perl/lib/5.5.660/alpha-dec_osf-thread-multi"             /**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.5.660/alpha-dec_osf-thread-multi"         /**/
 
 /* ARCHNAME:
  *     This symbol holds a string representing the architecture name.
@@ -2644,8 +2644,8 @@
  *     This symbol contains the ~name expanded version of PRIVLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/opt/perl/lib/5.5.650"                /**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.5.650"            /**/
+#define PRIVLIB "/opt/perl/lib/5.5.660"                /**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.5.660"            /**/
 
 /* PTRSIZE:
  *     This symbol contains the size of a pointer, so that the C preprocessor
@@ -2743,8 +2743,8 @@
  *     This symbol contains the ~name expanded version of SITEARCH, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "/opt/perl/lib/site_perl/5.5.650/alpha-dec_osf-thread-multi"          /**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.5.650/alpha-dec_osf-thread-multi"              /**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.5.660/alpha-dec_osf-thread-multi"          /**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.5.660/alpha-dec_osf-thread-multi"              /**/
 
 /* SITELIB:
  *     This symbol contains the name of the private library for this package.
@@ -2761,8 +2761,8 @@
  *     This symbol contains the ~name expanded version of SITELIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "/opt/perl/lib/site_perl/5.5.650"              /**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl/5.5.650"          /**/
+#define SITELIB "/opt/perl/lib/site_perl/5.5.660"              /**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.5.660"          /**/
 
 /* Size_t:
  *     This symbol holds the type used to declare length parameters
@@ -2929,7 +2929,7 @@
 /* PERL_XS_APIVERSION:
  *     This variable contains the version of the oldest perl binary
  *     compatible with the present perl.  perl.c:incpush() and
- *     lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.5.650/alpha-dec_osf-thread-multi for older
+ *     lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.5.660/alpha-dec_osf-thread-multi for older
  *     directories across major versions back to xs_apiversion.
  *     This is only useful if you have a perl library directory tree
  *     structured like the default one.
@@ -2948,7 +2948,7 @@
  *     compatible with the present perl.  (That is, pure perl modules
  *     written for pm_apiversion will still work for the current
  *     version).  perl.c:incpush() and lib/lib.pm will automatically
- *     search in /opt/perl/lib/site_perl/5.5.650 for older directories across major versions
+ *     search in /opt/perl/lib/site_perl/5.5.660 for older directories across major versions
  *     back to pm_apiversion.  This is only useful if you have a perl
  *     library directory tree structured like the default one.  The
  *     versioned site_perl library was introduced in 5.005, so that's
@@ -2958,7 +2958,13 @@
  *     (presumably) be similar.
  *     See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.5.650"
+#define PERL_XS_APIVERSION "5.5.660"
 #define PERL_PM_APIVERSION "5.005"
 
+/* I_SYS_UTSNAME:
+ *     This symbol, if defined, indicates that <sys/utsname.h> exists and
+ *     should be included.
+ */
+#define        I_SYS_UTSNAME           /**/
+
 #endif

diff --git a/config_h.SH b/config_h.SH
index b7c39f0..17e4aa2 100644 (file)
--- a/config_h.SH
+++ b/config_h.SH
@@ -2975,5 +2975,11 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define PERL_XS_APIVERSION "$xs_apiversion"
 #define PERL_PM_APIVERSION "$pm_apiversion"
 
+/* I_SYS_UTSNAME:
+ *     This symbol, if defined, indicates that <sys/utsname.h> exists and
+ *     should be included.
+ */
+#$i_sysutsname I_SYS_UTSNAME           /**/
+
 #endif
 !GROK!THIS!

diff --git a/ext/Sys/Hostname/Hostname.xs b/ext/Sys/Hostname/Hostname.xs
index 98c07cf..c2ab9bd 100644 (file)
--- a/ext/Sys/Hostname/Hostname.xs
+++ b/ext/Sys/Hostname/Hostname.xs
@@ -18,8 +18,7 @@
 #  endif
 #endif
 
-#if defined(HAS_UNAME) && !defined(WIN32)
-/* XXX need i_sys_utsname in config.sh */
+#ifdef I_SYS_UTSNAME
 #  include <sys/utsname.h>
 #endif