[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.14.2-8-g2a03159

[Clint Adams]

The following commit has been merged in the master branch:
commit ae649168df385c1037fd59bd68a20d8979944aa6
Author: Clint Adams <schizo at debian.org>
Date:   Tue Oct 27 20:55:43 2009 -0400

    Conditionally build MacOS X symbol-versioned wrappers.

diff --git a/Makefile.am b/Makefile.am
index 12176f7..ba6fd6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,20 @@ AUTOMAKE_OPTIONS=foreign
 ACLOCAL_AMFLAGS = -I build-aux
 SUBDIRS=scripts doc test
 
-noinst_LTLIBRARIES = libcommunicate.la
+noinst_LTLIBRARIES = libcommunicate.la libmacosx.la
 libcommunicate_la_SOURCES = communicate.c
 
+libmacosx_la_SOURCES = libfakeroot_inode64.c libfakeroot_unix2003.c patchattr.h
+
 lib_LTLIBRARIES=libfakeroot.la
 libfakeroot_la_SOURCES=libfakeroot.c statconv/glibc/linux/alpha/stats.h wrapdef.h  wrapstruct.h communicate.h
 libfakeroot_la_LDFLAGS=-release 0
 libfakeroot_la_DEPENDENCIES=wrapdef.h wrapstruct.h libcommunicate.la $(LTLIBOBJS)
+if MACOSX
+libfakeroot_la_LIBADD = libcommunicate.la libmacosx.la $(LTLIBOBJS)
+else !MACOSX
 libfakeroot_la_LIBADD = libcommunicate.la $(LTLIBOBJS)
+endif !MACOSX
 
 bin_PROGRAMS=faked
 faked_SOURCES = faked.c
diff --git a/configure.ac b/configure.ac
index faf057e..a227c13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,6 +507,21 @@ CPPFLAGS="$CPPFLAGS -I\$(srcdir)/statconv/glibc/linux/alpha"
         ;;
 esac
 
+dnl AH_TEMPLATE([MACOSX], [is __APPLE__ defined by the compiler])
+AC_MSG_CHECKING([for MacOS X/Darwin])
+  AC_PREPROC_IFELSE(
+    [AC_LANG_PROGRAM([[
+       #ifndef __APPLE__
+       #error We are somewhere better
+       #endif
+  ]])],
+    [macosx=true
+     AC_MSG_RESULT([yes])],
+    [AC_MSG_RESULT([no])
+     macosx=false]
+  )
+AM_CONDITIONAL([MACOSX], [test x$macosx = xtrue])
+
 AC_CONFIG_FILES([
    Makefile
    scripts/Makefile

-- 
fakeroot