Make libpthread buildable stand-alone.

* AUTHORS: New file.
* COPYING: Likewise.
* NEWS: Likewise.
* README: Likewise.
* configure.ac: New file.
* package.m4: Likewise.
* Makefile: Remove file after having merged essential parts into...
* Makefile.am: ... here.  Switch to using libtool for building both static and
shared libraries for the GNU system.  Use libtool's versioning infrastructure,
but maintain a compatibility symlink for the shared library.

8 files changed, 603 insertions, 264 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..0623928
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,3 @@
+Main author: Neal Walfield <neal@gnu.org>
+
+See the Git commit log for further contributors, 
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 04dfb26..0000000
--- a/Makefile
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#   Copyright (C) 1994, 1995, 1996, 1997, 2000, 2002, 2004, 2005, 2006, 2007,
-#     2008 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2, or (at
-#   your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := libpthread
-makemode := library
-
-MICROKERNEL := mach
-SYSDEPS := lockfile.c
-
-LCLHDRS := 
-
-SRCS := pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c		    \
-	pt-attr-getguardsize.c pt-attr-getinheritsched.c		    \
-	pt-attr-getschedparam.c pt-attr-getschedpolicy.c pt-attr-getscope.c \
-	pt-attr-getstack.c pt-attr-getstackaddr.c pt-attr-getstacksize.c    \
-	pt-attr-init.c pt-attr-setdetachstate.c pt-attr-setguardsize.c	    \
-	pt-attr-setinheritsched.c pt-attr-setschedparam.c		    \
-	pt-attr-setschedpolicy.c pt-attr-setscope.c pt-attr-setstack.c	    \
-	pt-attr-setstackaddr.c pt-attr-setstacksize.c			    \
-									    \
-	pt-barrier-destroy.c pt-barrier-init.c pt-barrier-wait.c	    \
-	pt-barrier.c pt-barrierattr-destroy.c pt-barrierattr-init.c	    \
-	pt-barrierattr-getpshared.c pt-barrierattr-setpshared.c		    \
-									    \
-	pt-destroy-specific.c pt-init-specific.c			    \
-	pt-key-create.c pt-key-delete.c					    \
-	pt-getspecific.c pt-setspecific.c				    \
-									    \
-	pt-once.c							    \
-									    \
-	pt-alloc.c							    \
-	pt-create.c							    \
-	pt-getattr.c							    \
-	pt-equal.c							    \
-	pt-dealloc.c							    \
-	pt-detach.c							    \
-	pt-exit.c							    \
-	pt-initialize.c							    \
-	pt-join.c							    \
-	pt-self.c							    \
-	pt-sigmask.c							    \
-	pt-spin-inlines.c						    \
-	pt-cleanup.c							    \
-	pt-setcancelstate.c						    \
-	pt-setcanceltype.c						    \
-	pt-testcancel.c							    \
-	pt-cancel.c							    \
-									    \
-	pt-mutexattr.c							    \
-	pt-mutexattr-destroy.c pt-mutexattr-init.c			    \
-	pt-mutexattr-getprioceiling.c pt-mutexattr-getprotocol.c	    \
-	pt-mutexattr-getpshared.c pt-mutexattr-gettype.c		    \
-	pt-mutexattr-setprioceiling.c pt-mutexattr-setprotocol.c	    \
-	pt-mutexattr-setpshared.c pt-mutexattr-settype.c		    \
-									    \
-	pt-mutex-init.c pt-mutex-destroy.c				    \
-	pt-mutex-lock.c pt-mutex-trylock.c pt-mutex-timedlock.c		    \
-	pt-mutex-unlock.c						    \
-	pt-mutex-transfer-np.c						    \
-	pt-mutex-getprioceiling.c pt-mutex-setprioceiling.c		    \
-									    \
-	pt-rwlock-attr.c						    \
-	pt-rwlockattr-init.c pt-rwlockattr-destroy.c			    \
-	pt-rwlockattr-getpshared.c pt-rwlockattr-setpshared.c		    \
-									    \
-	pt-rwlock-init.c pt-rwlock-destroy.c				    \
-	pt-rwlock-rdlock.c pt-rwlock-tryrdlock.c			    \
-	pt-rwlock-trywrlock.c pt-rwlock-wrlock.c			    \
-	pt-rwlock-timedrdlock.c pt-rwlock-timedwrlock.c			    \
-	pt-rwlock-unlock.c						    \
-									    \
-	pt-cond.c							    \
-	pt-condattr-init.c pt-condattr-destroy.c			    \
-	pt-condattr-getclock.c pt-condattr-getpshared.c			    \
-	pt-condattr-setclock.c pt-condattr-setpshared.c			    \
-									    \
-	pt-cond-destroy.c pt-cond-init.c				    \
-	pt-cond-brdcast.c						    \
-	pt-cond-signal.c						    \
-	pt-cond-wait.c							    \
-	pt-cond-timedwait.c						    \
-									    \
-	pt-stack-alloc.c						    \
-	pt-thread-alloc.c						    \
-	pt-thread-dealloc.c						    \
-	pt-thread-start.c						    \
-	pt-thread-halt.c						    \
-	pt-startup.c							    \
-									    \
-	pt-getconcurrency.c pt-setconcurrency.c				    \
-									    \
-	pt-block.c							    \
-	pt-timedblock.c							    \
-	pt-wakeup.c							    \
-	pt-docancel.c							    \
-	pt-sysdep.c							    \
-	pt-setup.c							    \
-	pt-machdep.c							    \
-	pt-spin.c							    \
-									    \
-	pt-sigstate-init.c						    \
-	pt-sigstate-destroy.c						    \
-	pt-sigstate.c							    \
-									    \
-	pt-atfork.c							    \
-	pt-kill.c							    \
-	pt-getcpuclockid.c						    \
-									    \
-	pt-getschedparam.c pt-setschedparam.c pt-setschedprio.c		    \
-									    \
-	sem-close.c sem-destroy.c sem-getvalue.c sem-init.c sem-open.c	    \
-	sem-post.c sem-timedwait.c sem-trywait.c sem-unlink.c		    \
-	sem-wait.c							    \
-									    \
-	cthreads-compat.c						    \
-	$(SYSDEPS)
-
-OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS))))
-
-OTHERTAGS = 
-
-libname = libpthread
-
-sysdeps_headers =				\
-              pthread.h				\
-              pthread/pthread.h			\
-              pthread/pthreadtypes.h		\
-	      semaphore.h			\
-						\
-              bits/pthread.h			\
-              bits/pthread-np.h			\
-              bits/mutex.h			\
-              bits/condition.h			\
-              bits/condition-attr.h		\
-              bits/spin-lock.h			\
-              bits/spin-lock-inline.h		\
-              bits/cancelation.h		\
-              bits/thread-attr.h		\
-              bits/barrier-attr.h		\
-              bits/barrier.h			\
-              bits/thread-specific.h		\
-              bits/once.h			\
-              bits/mutex-attr.h			\
-              bits/rwlock.h			\
-              bits/rwlock-attr.h		\
-	      bits/semaphore.h
-
-SYSDEP_PATH = $(srcdir)/sysdeps/$(MICROKERNEL)/hurd/ia32	\
-	 $(srcdir)/sysdeps/$(MICROKERNEL)/ia32			\
-	 $(srcdir)/sysdeps/ia32					\
-	 $(srcdir)/sysdeps/$(MICROKERNEL)/hurd			\
-	 $(srcdir)/sysdeps/$(MICROKERNEL)			\
-	 $(srcdir)/sysdeps/hurd					\
-	 $(srcdir)/sysdeps/generic				\
-	 $(srcdir)/sysdeps/posix				\
-	 $(srcdir)/pthread					\
-	 $(srcdir)/include
-
-VPATH += $(SYSDEP_PATH)
-
-HURDLIBS = ihash
-
-installhdrs :=
-installhdrsubdir := .
-
-include ../Makeconf
-
-CPPFLAGS += \
-	  $(addprefix -I, $(SYSDEP_PATH))		\
-	  -imacros $(srcdir)/include/libc-symbols.h	\
-	  -imacros $(srcdir)/not-in-libc.h
-
-
-install: install-headers $(libdir)/libpthread2.a $(libdir)/libpthread2_pic.a
-install-headers: $(addprefix $(includedir)/, $(sysdeps_headers))
-
-# XXX: If $(libdir)/libpthread2.a is installed and
-# $(libdir)/libpthread is not, we can have some issues.
-.PHONY: $(libdir)/libpthread.a $(libdir)/libpthread_pic.a
-
-# XXX: These rules are a hack.  But it is better than messing with
-# ../Makeconf at the moment.  Note that the linker scripts
-# $(srcdir)/libpthread.a and $(srcdir)/libpthread_pic.a get overwritten
-# when building in $(srcdir) and not a seperate build directory.
-$(libdir)/libpthread2.a: $(libdir)/libpthread.a
-	mv $< $@
-	$(INSTALL_DATA) $(srcdir)/libpthread.a $<
-
-$(libdir)/libpthread2_pic.a: $(libdir)/libpthread_pic.a
-	mv $< $@
-	$(INSTALL_DATA) $(srcdir)/libpthread_pic.a $<
-
-.PHONY: $(addprefix $(includedir)/, $(sysdeps_headers))
-
-$(addprefix $(includedir)/, $(sysdeps_headers)):
-	@set -e;							\
-	t="$@";								\
-	t=$${t#$(includedir)/};						\
-	header_ok=0;							\
-	for dir in $(SYSDEP_PATH);					\
-	do								\
-	  if test -e "$$dir/$$t";					\
-	  then								\
-	    tdir=`dirname "$@"`;					\
-	    if test ! -e $$tdir;					\
-	    then							\
-	      mkdir $$tdir;						\
-	    fi;								\
-	    echo $(INSTALL_DATA) "$$dir/$$t" "$@";			\
-	    $(INSTALL_DATA) "$$dir/$$t" "$@";				\
-	    header_ok=1;						\
-	    break;							\
-	  fi;								\
-	done;								\
-	if test "$${header_ok}" -ne 1;					\
-	then								\
-	  echo;								\
-	  echo '*** 'The header file \`$@\' is required, but not	\
-provided, by;								\
-	  echo '*** 'this configuration.  Please report this to the	\
-maintainer.;								\
-	  echo;								\
-	  false;							\
-	fi
-
-#  ifeq ($(VERSIONING),yes)
-#  
-#  # Adding this dependency gets it included in the command line,
-#  # where ld will read it as a linker script.
-#  $(libname).so.$(hurd-version): $(srcdir)/$(libname).map
-#  
-#  endif
diff --git a/Makefile.am b/Makefile.am
index e59c946..5690795 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am - Makefile template for libpthread.
-# Copyright (C) 2003, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004, 2005, 2006,
+#   2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Hurd.
 # 
@@ -17,6 +19,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
+# For as yet unknown reasons, in presence of libtool usage and target-specific
+# flags (lib*_la_*FLAGS), Automake no longer uses `$<' for accessing the source
+# files, thus losing the ability to use VPATH.  Restore the original behavior.
+# TODO: talk to libtool people.
+Makefile: Makefile.stamp
+Makefile.stamp: Makefile.pre
+	sed \
+	  < $< > Makefile.new \
+	  -e '/^#*	$$(LIBTOOL)/s%`test -f.*%$$<%'
+	mv Makefile.new Makefile
+	echo timestamp > $@
+
 if ARCH_IA32
   arch=ia32
 endif
@@ -24,51 +38,89 @@ if ARCH_POWERPC
   arch=powerpc
 endif
 
+if OS_GNU
+  microkernel=mach
+endif
+if OS_L4
+  microkernel=l4
+endif
+
 # The source files are scattered over several directories.  Add 
-# all these directories to the vpath.
-SYSDEP_PATH = $(srcdir)/sysdeps/l4/hurd/${arch}	\
-	 $(srcdir)/sysdeps/l4/${arch}		\
-	 $(srcdir)/sysdeps/${arch}		\
-	 $(srcdir)/sysdeps/l4/hurd		\
-	 $(srcdir)/sysdeps/l4			\
+# all these directories to the VPATH.
+SYSDEP_PATH = $(srcdir)/sysdeps/$(microkernel)/hurd/$(arch) \
+	 $(srcdir)/sysdeps/$(microkernel)/$(arch) \
+	 $(srcdir)/sysdeps/$(arch) \
+	 $(srcdir)/sysdeps/$(microkernel)/hurd \
+	 $(srcdir)/sysdeps/$(microkernel) \
 	 $(srcdir)/sysdeps/hurd			\
 	 $(srcdir)/sysdeps/generic		\
 	 $(srcdir)/sysdeps/posix		\
-	 $(srcdir)/pthread			\
-	 $(srcdir)/signal			\
+	 $(srcdir)/pthread
+if OS_L4
+SYSDEP_PATH += \
+	 $(srcdir)/signal
+endif
+SYSDEP_PATH += \
 	 $(srcdir)/include
-vpath %.c $(SYSDEP_PATH)
 
+VPATH += $(SYSDEP_PATH)
+
+if OS_GNU
+libpthread_la_CPPFLAGS = $(CPPFLAGS) \
+  $(addprefix -I, $(SYSDEP_PATH)) \
+  -imacros config.h \
+  -imacros $(srcdir)/include/libc-symbols.h \
+  -imacros $(srcdir)/not-in-libc.h \
+  -D_IO_MTSAFE_IO
+libpthread_la_CFLAGS = \
+  -Wall \
+  -std=gnu99
+libpthread_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -lihash
+endif
+if OS_L4
 AM_CPPFLAGS = $(USER_CPPFLAGS) -I$(srcdir)/pthread \
   $(addprefix -I, $(SYSDEP_PATH)) -imacros $(srcdir)/include/libc-symbols.h
 AM_CFLAGS = $(USER_CFLAGS)
+endif
 
 # Sources.
-SYSDEPS := lockfile.c
 
+if OS_GNU
+lib_LTLIBRARIES = libpthread.la
+libpthread_la_SOURCES = $(SRCS)
+else
+if OS_L4
 if ! ENABLE_TESTS
 noinst_LIBRARIES = libpthread.a
 endif
+libpthread_a_SOURCES = $(SRCS)
+endif
+endif
 
-libpthread_a_SOURCES = pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c \
+SRCS := pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c		    \
 	pt-attr-getguardsize.c pt-attr-getinheritsched.c		    \
 	pt-attr-getschedparam.c pt-attr-getschedpolicy.c pt-attr-getscope.c \
 	pt-attr-getstack.c pt-attr-getstackaddr.c pt-attr-getstacksize.c    \
 	pt-attr-init.c pt-attr-setdetachstate.c pt-attr-setguardsize.c	    \
 	pt-attr-setinheritsched.c pt-attr-setschedparam.c		    \
 	pt-attr-setschedpolicy.c pt-attr-setscope.c pt-attr-setstack.c	    \
-	pt-attr-setstackaddr.c pt-attr-setstacksize.c pt-attr.c		    \
+	pt-attr-setstackaddr.c pt-attr-setstacksize.c			    \
+									    \
 	pt-barrier-destroy.c pt-barrier-init.c pt-barrier-wait.c	    \
 	pt-barrier.c pt-barrierattr-destroy.c pt-barrierattr-init.c	    \
 	pt-barrierattr-getpshared.c pt-barrierattr-setpshared.c		    \
+									    \
 	pt-destroy-specific.c pt-init-specific.c			    \
 	pt-key-create.c pt-key-delete.c					    \
 	pt-getspecific.c pt-setspecific.c				    \
+									    \
 	pt-once.c							    \
+									    \
 	pt-alloc.c							    \
 	pt-create.c							    \
 	pt-getattr.c							    \
-	pt-pool-np.c							    \
 	pt-equal.c							    \
 	pt-dealloc.c							    \
 	pt-detach.c							    \
@@ -83,41 +135,50 @@ libpthread_a_SOURCES = pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c \
 	pt-setcanceltype.c						    \
 	pt-testcancel.c							    \
 	pt-cancel.c							    \
+									    \
 	pt-mutexattr.c							    \
 	pt-mutexattr-destroy.c pt-mutexattr-init.c			    \
 	pt-mutexattr-getprioceiling.c pt-mutexattr-getprotocol.c	    \
 	pt-mutexattr-getpshared.c pt-mutexattr-gettype.c		    \
 	pt-mutexattr-setprioceiling.c pt-mutexattr-setprotocol.c	    \
 	pt-mutexattr-setpshared.c pt-mutexattr-settype.c		    \
+									    \
 	pt-mutex-init.c pt-mutex-destroy.c				    \
 	pt-mutex-lock.c pt-mutex-trylock.c pt-mutex-timedlock.c		    \
 	pt-mutex-unlock.c						    \
 	pt-mutex-transfer-np.c						    \
 	pt-mutex-getprioceiling.c pt-mutex-setprioceiling.c		    \
+									    \
 	pt-rwlock-attr.c						    \
 	pt-rwlockattr-init.c pt-rwlockattr-destroy.c			    \
 	pt-rwlockattr-getpshared.c pt-rwlockattr-setpshared.c		    \
+									    \
 	pt-rwlock-init.c pt-rwlock-destroy.c				    \
 	pt-rwlock-rdlock.c pt-rwlock-tryrdlock.c			    \
 	pt-rwlock-trywrlock.c pt-rwlock-wrlock.c			    \
 	pt-rwlock-timedrdlock.c pt-rwlock-timedwrlock.c			    \
 	pt-rwlock-unlock.c						    \
+									    \
 	pt-cond.c							    \
 	pt-condattr-init.c pt-condattr-destroy.c			    \
 	pt-condattr-getclock.c pt-condattr-getpshared.c			    \
 	pt-condattr-setclock.c pt-condattr-setpshared.c			    \
+									    \
 	pt-cond-destroy.c pt-cond-init.c				    \
 	pt-cond-brdcast.c						    \
 	pt-cond-signal.c						    \
 	pt-cond-wait.c							    \
 	pt-cond-timedwait.c						    \
+									    \
 	pt-stack-alloc.c						    \
 	pt-thread-alloc.c						    \
 	pt-thread-dealloc.c						    \
 	pt-thread-start.c						    \
 	pt-thread-halt.c						    \
 	pt-startup.c							    \
+									    \
 	pt-getconcurrency.c pt-setconcurrency.c				    \
+									    \
 	pt-block.c							    \
 	pt-timedblock.c							    \
 	pt-wakeup.c							    \
@@ -126,16 +187,28 @@ libpthread_a_SOURCES = pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c \
 	pt-setup.c							    \
 	pt-machdep.c							    \
 	pt-spin.c							    \
+									    \
 	pt-sigstate-init.c						    \
 	pt-sigstate-destroy.c						    \
 	pt-sigstate.c							    \
+									    \
 	pt-atfork.c							    \
 	pt-kill.c							    \
 	pt-getcpuclockid.c						    \
+									    \
 	pt-getschedparam.c pt-setschedparam.c pt-setschedprio.c		    \
-	sem-close.c sem-init.c sem-timedwait.c sem-wait.c		    \
-	sem-destroy.c sem-open.c sem-trywait.c sem-getvalue.c		    \
-	sem-post.c sem-unlink.c						    \
+									    \
+	sem-close.c sem-destroy.c sem-getvalue.c sem-init.c sem-open.c	    \
+	sem-post.c sem-timedwait.c sem-trywait.c sem-unlink.c		    \
+	sem-wait.c
+
+if OS_GNU
+SRCS += cthreads-compat.c						    \
+									    \
+	lockfile.c
+endif
+if OS_L4
+SRCS += pt-pool-np.c							    \
 									    \
 	pt-setactivity-np.c						    \
 									    \
@@ -165,3 +238,80 @@ libpthread_a_SOURCES = pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c \
 	sigwaitinfo.c							    \
 	signal-dispatch-lowlevel.c					    \
 	sigprocmask.c
+endif
+
+HEADERS_INSTALL :=				\
+              pthread.h				\
+              pthread/pthread.h			\
+              pthread/pthreadtypes.h		\
+	      semaphore.h			\
+						\
+              bits/pthread.h			\
+              bits/pthread-np.h			\
+              bits/mutex.h			\
+              bits/condition.h			\
+              bits/condition-attr.h		\
+              bits/spin-lock.h			\
+              bits/spin-lock-inline.h		\
+              bits/cancelation.h		\
+              bits/thread-attr.h		\
+              bits/barrier-attr.h		\
+              bits/barrier.h			\
+              bits/thread-specific.h		\
+              bits/once.h			\
+              bits/mutex-attr.h			\
+              bits/rwlock.h			\
+              bits/rwlock-attr.h		\
+	      bits/semaphore.h
+
+if OS_GNU
+.PHONY: install-data-local
+install-data-local: install-data-local-headers \
+  instal-data-local-fix-libpthread_a \
+  instal-data-local-add-libpthread_so_symlink
+
+.PHONY: install-data-local-headers
+install-data-local-headers: Makefile
+	for f in $(HEADERS_INSTALL); do \
+	  header_ok=n; \
+	  for d in $(SYSDEP_PATH); do \
+	    if test -f "$$d/$$f"; then \
+	      fdir=$(DESTDIR)$(includedir)/$$(dirname "$$f") && \
+	      { test -d $$fdir/ \
+	        || $(MKDIR_P) "$$fdir"; } && \
+	      $(INSTALL_DATA) \
+	        "$$d/$$f" \
+	        "$(DESTDIR)$(includedir)/$$f" && \
+	      header_ok=y && \
+	      break; \
+	    fi; \
+	  done; \
+	  if [ "$$header_ok" != y ]; then \
+	    echo '*** The header file `'"$$f"\'' is missing.' && \
+	    echo '*** Please report this to <$(PACKAGE_BUGREPORT)>.' && \
+	    exit 1; \
+	  fi; \
+	done
+
+# TODO: it is not guaranteed that `install-data' will always be done after
+# `install-exec'.  And, we're not allowed to make `install-data-local' depend
+# on `install-exec'.  TODO: what is the libtool way of doing this?
+.PHONY: instal-data-local-fix-libpthread_a
+instal-data-local-fix-libpthread_a:
+	if test -f $(DESTDIR)$(libdir)/libpthread.a; then \
+	  rm -f $(DESTDIR)$(libdir)/libpthread2.a && \
+	  mv \
+	    $(DESTDIR)$(libdir)/libpthread.a \
+	    $(DESTDIR)$(libdir)/libpthread2.a; \
+	fi
+	$(INSTALL_DATA) \
+	  $(srcdir)/libpthread.a \
+	  $(DESTDIR)$(libdir)/libpthread.a
+
+# TODO: once in a time, when everything has been re-linked...
+.PHONY: instal-data-local-add-libpthread_so_symlink
+instal-data-local-add-libpthread_so_symlink:
+	rm -f $(DESTDIR)$(libdir)/libpthread.so.0.3
+	t=$(shell readlink $(DESTDIR)$(libdir)/libpthread.so) && \
+	$(LN_S) "$$t" $(DESTDIR)$(libdir)/libpthread.so.0.3
+endif
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..a1b4bae
--- /dev/null
+++ b/NEWS
@@ -0,0 +1 @@
+No news is good news?
diff --git a/README b/README
new file mode 100644
index 0000000..783603d
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+POSIX threading library.
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..894c91d
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,88 @@
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# 
+# This file is part of the POSIX threading library.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+m4_include([package.m4])
+AC_INIT(
+  [AC_PACKAGE_NAME],
+  [AC_PACKAGE_VERSION],
+  [AC_PACKAGE_BUGREPORT],
+  [AC_PACKAGE_TARNAME]
+)
+AC_CONFIG_SRCDIR([include/pthread/pthread.h])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AM_INIT_AUTOMAKE(
+dnl Don't define `PACKAGE' and `VERSION'.
+  [no-define]
+dnl We require GNU make.
+  [-Wall -Wno-portability]
+)
+
+AC_PROG_CC
+
+AC_CHECK_FUNCS([uselocale])
+AC_CHECK_LIB([ihash], [hurd_ihash_create], [:],
+  [AC_MSG_ERROR([need libihash])]
+)
+
+AC_GNU_SOURCE
+
+AC_CANONICAL_HOST
+[arch_ia32=false
+arch_powerpc=false
+case $host_cpu in
+  i386 | i486 | i586 | i686)
+    arch_ia32=true
+    ;;
+  powerpc)
+    arch_powerpc=true
+    ;;
+  *)]
+    AC_MSG_ERROR([unsupported architecture])
+    [;;
+esac]
+AM_CONDITIONAL([ARCH_IA32], [$arch_ia32])
+AM_CONDITIONAL([ARCH_POWERPC], [$arch_powerpc])
+[os_gnu=false
+case $host_os in
+  gnu*)
+    os_gnu=true
+    ;;
+  *)]
+    AC_MSG_ERROR([unsupported system])
+    [;;
+esac]
+AM_CONDITIONAL([OS_GNU], [$os_gnu])
+AM_CONDITIONAL([OS_L4], [false])
+
+AM_CONDITIONAL([ENABLE_TESTS], [false])
+
+LT_INIT
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES(
+  [Makefile.pre:Makefile.in]
+)
+# See the comment in `Makefile.am'.
+AC_CONFIG_COMMANDS([Makefile],
+  [# This is OK to get us going, the Makefile will then do the rest.
+  cp Makefile.pre Makefile &&
+  rm -f Makefile.stamp]
+)
+
+AC_OUTPUT
diff --git a/package.m4 b/package.m4
new file mode 100644
index 0000000..f83d4b6
--- /dev/null
+++ b/package.m4
@@ -0,0 +1,4 @@
+m4_define([AC_PACKAGE_NAME],[POSIX threading library])
+m4_define([AC_PACKAGE_VERSION],[0])
+m4_define([AC_PACKAGE_BUGREPORT],[bug-hurd@gnu.org])
+m4_define([AC_PACKAGE_TARNAME],[libpthread])