configure.in: Check for unistd.h as well.

0
	* configure.in: Check for unistd.h as well.
	* configure: Rebuild.
	* config.in: Rebuild.
	* getpagesize.c (GNU_OUR_PAGESIZE): Use sysconf only if _SC_PAGESIZE
	is defined in unistd.h. Reformat conditional block for easier reading.
	* config.table (shared): Default to no if ${enable_shared}
	is unset or empty; this logic is used by the toplevel
	configure scripts, too.

From-SVN: r19924

diff --git a/libiberty/config.in b/libiberty/config.in
index 5ef47b051a79968f0c67e0646bbe4ab12641d498..4195348d537ca6f4b28072be45cf52013e328c83 100644 (file)
--- a/libiberty/config.in
+++ b/libiberty/config.in
@@ -186,3 +186,6 @@
 
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H

diff --git a/libiberty/configure b/libiberty/configure
index d8ed85a90e587b660c0214ac0321cc867966565d..4b4dee50da2811fe87e622964e6794eb1f31cea1 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -1019,7 +1019,7 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in sys/file.h sys/param.h stdlib.h string.h
+for ac_hdr in sys/file.h sys/param.h stdlib.h string.h unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/libiberty/getpagesize.c b/libiberty/getpagesize.c
index d6327a8887dd030a2b9a03228175a3989574c0cf..564d6c02312f4935262ef95ae580eb3d301ab271 100644 (file)
--- a/libiberty/getpagesize.c
+++ b/libiberty/getpagesize.c
@@ -35,31 +35,36 @@ BUGS
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_SYSCONF
+#undef GNU_OUR_PAGESIZE
+#if defined (HAVE_SYSCONF) && defined (HAVE_UNISTD_H)
 #include <unistd.h>
+#ifdef _SC_PAGESIZE
 #define GNU_OUR_PAGESIZE sysconf(_SC_PAGESIZE)
-#else
-#ifdef PAGESIZE
-#define        GNU_OUR_PAGESIZE PAGESIZE
-#else  /* no PAGESIZE */
-#ifdef EXEC_PAGESIZE
-#define        GNU_OUR_PAGESIZE EXEC_PAGESIZE
-#else  /* no EXEC_PAGESIZE */
-#ifdef NBPG
-#define        GNU_OUR_PAGESIZE (NBPG * CLSIZE)
-#ifndef        CLSIZE
-#define        CLSIZE 1
-#endif /* CLSIZE */
-#else  /* no NBPG */
-#ifdef NBPC
-#define        GNU_OUR_PAGESIZE NBPC
-#else  /* no NBPC */
-#define        GNU_OUR_PAGESIZE 4096   /* Just punt and use reasonable value */
-#endif /* NBPC */
-#endif /* NBPG */
-#endif /* EXEC_PAGESIZE */
-#endif /* PAGESIZE */
-#endif /* HAVE_SYSCONF */
+#endif
+#endif
+
+#ifndef GNU_OUR_PAGESIZE
+# ifdef        PAGESIZE
+#  define      GNU_OUR_PAGESIZE PAGESIZE
+# else /* no PAGESIZE */
+#  ifdef       EXEC_PAGESIZE
+#   define     GNU_OUR_PAGESIZE EXEC_PAGESIZE
+#  else        /* no EXEC_PAGESIZE */
+#   ifdef      NBPG
+#    define    GNU_OUR_PAGESIZE (NBPG * CLSIZE)
+#    ifndef    CLSIZE
+#     define   CLSIZE 1
+#    endif     /* CLSIZE */
+#   else       /* no NBPG */
+#    ifdef     NBPC
+#     define   GNU_OUR_PAGESIZE NBPC
+#    else      /* no NBPC */
+#     define   GNU_OUR_PAGESIZE 4096   /* Just punt and use reasonable value */
+#    endif /* NBPC */
+#   endif /* NBPG */
+#  endif /* EXEC_PAGESIZE */
+# endif /* PAGESIZE */
+#endif /* GNU_OUR_PAGESIZE */
 
 int
 getpagesize ()