Index: ossp-pkg/uuid/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v rcsdiff -q -kk '-r1.143' '-r1.144' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v' 2>/dev/null --- ChangeLog 2007/01/01 18:39:52 1.143 +++ ChangeLog 2007/05/19 19:30:34 1.144 @@ -13,6 +13,12 @@ Changes between 1.5.1 and 1.6.0 (31-Jul-2006 to 05-Oct-2006) + o Make GNU autoconf procedure of PHP binding more robust by using + -Wl,-Bsymbolic only on platforms where uuid_create(3) actually + exists and where -Wl,-Bsymbolic is really accepted by the tool + chain. This especially unbreaks MacOS X. + [Ralf S. Engelschall] + o Fix "uuid_export" function in PHP bindings under UUID_FMT_SIV, UUID_FMT_STR and UUID_FMT_TXT where the NUL-termination character should be not passed back to PHP. Index: ossp-pkg/uuid/php/config.m4 RCS File: /v/ossp/cvs/ossp-pkg/uuid/php/Attic/config.m4,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/uuid/php/Attic/config.m4,v' 2>/dev/null --- config.m4 2007/01/01 18:14:58 1.3 +++ config.m4 2007/05/19 19:30:35 1.4 @@ -37,7 +37,12 @@ PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) PHP_ADD_INCLUDE([..]) PHP_SUBST(UUID_SHARED_LIBADD) - dnl avoid conflict with libc's uuid_create(3) - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-Bsymbolic" + + dnl avoid linking conflict with a potentially existing uuid_create(3) in libc + AC_CHECK_FUNC(uuid_create,[ + SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" + AC_TRY_LINK([],[], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-Bsymbolic"]) + LDFLAGS="$SAVE_LDFLAGS"]) fi