svn commit: branches/uClibc_0_9_29: include
vapier at uclibc.org
vapier at uclibc.org
Sat Jan 5 17:54:32 UTC 2008
Author: vapier
Date: 2008-01-05 09:54:32 -0800 (Sat, 05 Jan 2008)
New Revision: 20789
Log:
Merge r20475 by bernds from trunk:
Certain configure scripts test for presence of dlfcn.h. Don't install it
if !HAVE_SHARED.
Modified:
branches/uClibc_0_9_29/Makefile.in
branches/uClibc_0_9_29/include/link.h
Changeset:
Modified: branches/uClibc_0_9_29/Makefile.in
===================================================================
--- branches/uClibc_0_9_29/Makefile.in 2008-01-05 17:54:17 UTC (rev 20788)
+++ branches/uClibc_0_9_29/Makefile.in 2008-01-05 17:54:32 UTC (rev 20789)
@@ -196,6 +196,11 @@
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/*thread*.h
endif
+ifneq ($(HAVE_SHARED),y)
+ # Remove dlfcn header if we don't have shared libraries.
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dlfcn.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/dlfcn.h
+endif
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
# Remove this as it is only used internally.
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/tls.h
Modified: branches/uClibc_0_9_29/include/link.h
===================================================================
--- branches/uClibc_0_9_29/include/link.h 2008-01-05 17:54:17 UTC (rev 20788)
+++ branches/uClibc_0_9_29/include/link.h 2008-01-05 17:54:32 UTC (rev 20789)
@@ -23,7 +23,9 @@
#include <features.h>
#include <elf.h>
+#ifndef __HAVE_NO_SHARED__
#include <dlfcn.h>
+#endif
#include <sys/types.h>
#if defined _LIBC && defined __UCLIBC_HAS_THREADS_NATIVE__
#include <tls.h>
More information about the uClibc-cvs
mailing list