the usual
diff --git a/ChangeLog b/ChangeLog
index a57f6d6..acfcab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,151 @@
+Mon Feb 13 12:39:16 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* README: removed remark on NeXT and -posix since this is now done
+	by configure
+
+	* Mac/config.c, Modules/config.c.in (getversion): tack compiler
+        name and version (where known) onto version string
+
+	* Python/{ceval.c,bltinmodule.c}: call __import__ with 4
+	arguments: modulename, globals, locals, list_of_from_names_or_None
+	(for Ken Manheimer)
+
+	* Objects/floatobject.c: work-around for NeXT Sparc 3.3 prerelease
+	(Barry Warsaw)
+
+	* Python/ceval.c (eval_code): call locals_2_fast before doing
+	import from (Jim Roskind)
+
+Fri Feb 10 17:08:35 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Objects/object.c (newvarobject), Include/objimpl.h: make size
+        argument signed
+
+	* Include/allobjects.h, several other files: introduce
+	Py_CHARMASK(c) which expands to c&0xff, or just c if characters
+	are unsigned.  This should fix problems with passing negative
+	values to isspace() and friends for characters > 0x7f on systems
+	where 'char' is signed
+
+Thu Feb  9 10:26:21 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Lib/copy.py: added __doc__ strings
+
+	* Lib/shelve.py: added __doc__ strings
+
+	* Lib/anydbm.py: added __doc__ strings and test for gdbm
+
+	* Include/longintrepr.h: remove untrue comment about
+	signed/unsigned ob_size
+
+	* Modules/mpzmodule.c (mpz_div_and_mod): add proper casts (Jim
+	Fulton)
+
+Wed Feb  8 15:48:24 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Python/bltinmodule.c (do_pow), Objects/floatobject.c
+	(float_pow): move check for negative float to the float power to
+	the pow() function, so negative float to the integer power can be
+	implemented correctly (after coercion to float)
+
+Tue Feb  7 10:14:34 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Python/import.c (init_frozen): make it non-static, so
+	frozenmain.c can use it.  Also remove the reference to
+	frozenmain.o from Python/Makefile.in
+
+	* Doc/{ref6.tex,ref7.tex} (raise, except): describe classes and
+	instances used as exceptions (R Lindsay Todd)
+
+	* Lib/test/test_exceptions.py: added tests for raising classes (R
+        Lindsay Todd)
+
+	* Python/ceval.c (exec_statement): DECREF result of run_string
+	(Mark Lutz)
+
+	* Modules/cursesmodule.c: patches to clear errors between failing
+	calls to Arg_Parse (Steve Clift)
+
+Fri Feb  3 13:48:12 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Lib/bdb.py (format_stack_entry): append () to function name if
+        no __args__
+
+	* Lib/pdb.py (print_stack_entry): default prompt_prefix is
+        line_prefix, and use the default everywhere
+
+Thu Feb  2 15:27:15 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Python/pythonrun.c (print_error): print class name for
+	exceptions that are classes (R Lindsay Todd)
+
+	* Modules/tkintermodule.c: use PyCallable_Check instead of
+	manually checking for some callable types for callbacks; export
+	TK_VERSION and TCL_VERSION strings; a few Tk 4.0 specific changes
+
+	* Modules/socketmodule.c (initsocket): added a long list of socket
+	related constants -- better here than in a separate python module,
+	because the values change per system (R Lindsay Todd)
+
+	* Doc/{lib.tex,libsignal.tex}: added documentation for signal
+	module (Andrew Kuchling)
+
+Tue Jan 31 13:06:59 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Include/pythonrun.h: remove declaration of (now static)
+	run_pyc_file
+
+	* Modules/posixmodule.c (posix_utime): correct typo in utime()
+	stub
+
+Tue Jan 31 11:02:00 1995  Guido van Rossum  <guido@guppie.cwi.nl>
+
+	* Modules/{pwdmodule.c,grpmodule.c} (mkpwent, mkgrent): NeXT
+	specific patch for little endian machines where the uid and gid
+	are in the wrong place in the structure (Mike Carlton)
+
+Mon Jan 30 16:17:33 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* configure.in: add -posix to definition of CC when detecting Next
+
+Mon Jan 30 13:32:07 1995  Guido van Rossum  <guido@guppie.cwi.nl>
+
+	* Mac/*: not clearly logged are lots of changes to the Mac
+	specific modules, e.g. reworking of the interrupt detection code
+	and general reorganization of macglue.[ch], as well as support for
+	modules generated by "bgen" (see Demo/bgen), and subsequent
+	removal of the resource and sound interfaces from MacOS (since
+	they now have their own, complete, generated interface), and also
+	lots of development on the mactcp and macfs front
+
+	* Modules/stdwinmodule.c (initstdwin): disable python's own event
+	processing on the mac as soon as stdwin is imported; removed some
+	unused variables
+
+	* Parser/intrcheck.c: moved all mac specific stuff to
+	Mac/macglue.c
+
+	* Python/pythonrun.c (goaway): Think C mod to suppress pausing at
+        normal exit
+
+	* Python/import.c (imp_get_magic): fix glaring indexing bug
+
+	* Modules/dbmmodule.c (dbm_keys): fix memory leak and tighten
+	error checking (and redo lay-out)
+
+Fri Jan 27 00:00:17 1995  Guido van Rossum  <guido@zeus.cwi.nl>
+
+	* Objects/listobject.c: round up item count on resize to improve
+	realloc performance (dramatic effect in the Mac with Think C!)
+
+	* Include/{rename2.h,methodobject.h}, Objects/methodobject.c:
+	added support for chaining method lists: Py_FindMethodInChain
+
+Thu Jan 26 12:59:51 1995  Guido van Rossum  <guido@guppie.cwi.nl>
+
+	* Python/Makefile.in: removed frozenmain.o from OBJS -- it has no
+	business being in libPython.a.  (Still build it though.)
+
 Thu Jan 26 00:42:29 1995  Guido van Rossum  <guido@zeus.cwi.nl>
 
 	* Lib/mhlib.py: fix bogus test for matching regex
@@ -19,7 +167,7 @@
 
 	* Objects/object.c, Python/bltinmodule.c: moved callable() to
 	object.c (from static in bltinmodule.c) since it is generally
-	useful (and I needed it :-)
+	useful (and I needed it :-); removed some unused vars
 
 Wed Jan 25 13:20:52 1995  Guido van Rossum  <guido@zeus.cwi.nl>
 
diff --git a/Makefile.in b/Makefile.in
index dc8de8c..7d09e35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -230,6 +230,7 @@
 
 localclobber:	localclean
 		-rm -f tags TAGS python
+		-rm -f config.log config.cache config.h Makefile
 
 clobber:	localclobber
 		-for i in $(SUBDIRS); do \
diff --git a/README b/README
index f8cdbd4..dc9f56d 100644
--- a/README
+++ b/README
@@ -52,13 +52,10 @@
 HP-UX users: read the file Misc/HPUX-NOTES if you want to be able to
 use shared libraries for dynamically loaded modules.
 
-Minix users: when using ack, use "CC=cc AR=aal RANLIB=: ./configure"!
+DEC Alpha users: unless you like debugging GCC, pass "--without-gcc"
+to the configure script.
 
-NeXT users: everything must be linked and compiled with "-posix".
-Until I find out how to let the configure script do that
-automatically, the best way is to run compile with "CC='cc -posix'" in
-the environment; the next best way is to edit the toplevel Makefile
-(after running configure) to add -posix to OPT.
+Minix users: when using ack, use "CC=cc AR=aal RANLIB=: ./configure"!
 
 You can configure the interpreter to contain fewer or more built-in
 modules by editing the file Modules/Setup.  This file is initially
diff --git a/configure b/configure
index ed2f7e8..8f6beb2 100755
--- a/configure
+++ b/configure
@@ -775,7 +775,8 @@
   cat >> confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
- was_it_defined=yes
+
+CC="$CC -posix"; was_it_defined=yes
 fi
 fi
 rm -fr conftest*
@@ -788,7 +789,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 792 "configure"
+#line 793 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -810,7 +811,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 814 "configure"
+#line 815 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -828,7 +829,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 832 "configure"
+#line 833 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -849,7 +850,7 @@
   ac_cv_header_stdc=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 853 "configure"
+#line 854 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -886,7 +887,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 890 "configure"
+#line 891 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -923,7 +924,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 927 "configure"
+#line 928 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -962,7 +963,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -ldir "
 cat > conftest.$ac_ext <<EOF
-#line 966 "configure"
+#line 967 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -996,7 +997,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lx "
 cat > conftest.$ac_ext <<EOF
-#line 1000 "configure"
+#line 1001 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1029,7 +1030,7 @@
 was_it_defined=no
 echo $ac_n "checking for clock_t in time.h""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 1033 "configure"
+#line 1034 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -1053,7 +1054,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1057 "configure"
+#line 1058 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1084,7 +1085,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1088 "configure"
+#line 1089 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1115,7 +1116,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1119 "configure"
+#line 1120 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1146,7 +1147,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1150 "configure"
+#line 1151 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1180,7 +1181,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1184 "configure"
+#line 1185 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1211,7 +1212,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1215 "configure"
+#line 1216 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -1294,7 +1295,10 @@
 if test -z "$CCSHARED"
 then
 	case $ac_sys_system in
-	hp*|HP*) CCSHARED="+z";;
+	hp*|HP*) if test "$GCC" = yes;
+		 then CCSHARED="-fpic";
+		 else CCSHARED="+z";
+		 fi;;
 	esac
 fi
 echo "$ac_t""$CCSHARED" 1>&4
@@ -1317,7 +1321,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -ldl "
 cat > conftest.$ac_ext <<EOF
-#line 1321 "configure"
+#line 1325 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1356,7 +1360,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1364 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1395,7 +1399,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lsun "
 cat > conftest.$ac_ext <<EOF
-#line 1399 "configure"
+#line 1403 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1442,7 +1446,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 1446 "configure"
+#line 1450 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1475,7 +1479,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -linet -lnsl"
 cat > conftest.$ac_ext <<EOF
-#line 1479 "configure"
+#line 1483 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1508,7 +1512,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lsocket $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1512 "configure"
+#line 1516 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1557,7 +1561,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 1561 "configure"
+#line 1565 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1589,7 +1593,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -ltermlib "
 cat > conftest.$ac_ext <<EOF
-#line 1593 "configure"
+#line 1597 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1648,7 +1652,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 1652 "configure"
+#line 1656 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1690,7 +1694,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lmpc "
 cat > conftest.$ac_ext <<EOF
-#line 1694 "configure"
+#line 1698 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1728,7 +1732,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lthread "
 cat > conftest.$ac_ext <<EOF
-#line 1732 "configure"
+#line 1736 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1822,7 +1826,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1826 "configure"
+#line 1830 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1869,7 +1873,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1873 "configure"
+#line 1877 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1912,7 +1916,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1916 "configure"
+#line 1920 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1943,7 +1947,7 @@
 if eval "test \"`echo '$ac_cv_func_'getpgrp`\" = yes"; then
   echo "$ac_t""yes" 1>&4
   cat > conftest.$ac_ext <<EOF
-#line 1947 "configure"
+#line 1951 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -1969,7 +1973,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1973 "configure"
+#line 1977 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -2000,7 +2004,7 @@
 if eval "test \"`echo '$ac_cv_func_'setpgrp`\" = yes"; then
   echo "$ac_t""yes" 1>&4
   cat > conftest.$ac_ext <<EOF
-#line 2004 "configure"
+#line 2008 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -2026,7 +2030,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2030 "configure"
+#line 2034 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -2057,7 +2061,7 @@
 if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then
   echo "$ac_t""yes" 1>&4
   cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
+#line 2065 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int main() { return 0; }
@@ -2087,7 +2091,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2091 "configure"
+#line 2095 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2120,7 +2124,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2124 "configure"
+#line 2128 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -2152,7 +2156,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2156 "configure"
+#line 2160 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -2183,7 +2187,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2187 "configure"
+#line 2191 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -2219,7 +2223,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2223 "configure"
+#line 2227 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() { return 0; }
@@ -2249,7 +2253,7 @@
 was_it_defined=no
 echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2257 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2281,7 +2285,7 @@
   if test "$GCC" = yes; then
   # GCC predefines this symbol on systems where it applies.
 cat > conftest.$ac_ext <<EOF
-#line 2285 "configure"
+#line 2289 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -2303,7 +2307,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 2307 "configure"
+#line 2311 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -2337,7 +2341,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2341 "configure"
+#line 2345 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2409,7 +2413,7 @@
 works=no
 echo $ac_n "checking for working volatile""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2413 "configure"
+#line 2417 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2434,7 +2438,7 @@
 works=no
 echo $ac_n "checking for working signed char""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2438 "configure"
+#line 2442 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2459,7 +2463,7 @@
 have_prototypes=no
 echo $ac_n "checking for prototypes""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2463 "configure"
+#line 2467 "configure"
 #include "confdefs.h"
 int foo(int x) { return 0; }
 int main() { return 0; }
@@ -2481,7 +2485,7 @@
 works=no
 echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2485 "configure"
+#line 2489 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -2507,7 +2511,7 @@
 bad_prototypes=no
 echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2511 "configure"
+#line 2515 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -2535,7 +2539,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 2539 "configure"
+#line 2543 "configure"
 #include "confdefs.h"
 
 struct s { int a; int b; };
@@ -2567,7 +2571,7 @@
 va_list_is_array=no
 echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&4
 cat > conftest.$ac_ext <<EOF
-#line 2571 "configure"
+#line 2575 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDARG_PROTOTYPES
@@ -2605,7 +2609,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="$LIBS -lieee "
 cat > conftest.$ac_ext <<EOF
-#line 2609 "configure"
+#line 2613 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2675,7 +2679,7 @@
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2679 "configure"
+#line 2683 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -2726,7 +2730,7 @@
   ac_cv_func_getopt=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 2730 "configure"
+#line 2734 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 extern int optind, opterr, getopt();
diff --git a/configure.in b/configure.in
index f471614..0ef0473 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,8 @@
 #ifdef _NEXT_SOURCE
 main() { exit(0); }
 #endif
-], AC_DEFINE(_POSIX_SOURCE) was_it_defined=yes)
+], AC_DEFINE(_POSIX_SOURCE)
+CC="$CC -posix"; was_it_defined=yes)
 AC_MSG_CHECKING(for NeXT)
 AC_MSG_RESULT($was_it_defined)
 
@@ -127,7 +128,10 @@
 if test -z "$CCSHARED"
 then
 	case $ac_sys_system in
-	hp*|HP*) CCSHARED="+z";;
+	hp*|HP*) if test "$GCC" = yes;
+		 then CCSHARED="-fpic";
+		 else CCSHARED="+z";
+		 fi;;
 	esac
 fi
 AC_MSG_RESULT($CCSHARED)