Author: jelmer Date: 2007-11-16 21:50:31 +0000 (Fri, 16 Nov 2007) New Revision: 26005
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26005 Log: Notice the user about LD_LIBRARY_PATH or equivalent when building with shared libs. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/build/m4/check_ld.m4 branches/SAMBA_4_0/source/build/smb_build/main.pl branches/SAMBA_4_0/source/dsdb/config.mk Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 20:54:13 UTC (rev 26004) +++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 21:50:31 UTC (rev 26005) @@ -105,6 +105,7 @@ AC_LIBREPLACE_SHLD_FLAGS AC_LIBREPLACE_MDLD AC_LIBREPLACE_MDLD_FLAGS +AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR ####################################################### # test whether building a shared library actually works Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/main.pl 2007-11-16 20:54:13 UTC (rev 26004) +++ branches/SAMBA_4_0/source/build/smb_build/main.pl 2007-11-16 21:50:31 UTC (rev 26005) @@ -54,6 +54,8 @@ $mkenv->Integrated($key) if grep(/INTEGRATED/, @{$key->{OUTPUT_TYPE}}); } +my $shared_libs_used = 0; + foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; @@ -62,6 +64,10 @@ and defined($key->{VERSION}); $mkenv->SharedLibrary($key) if $key->{TYPE} eq "LIBRARY" and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); + if ($key->{TYPE} eq "LIBRARY" and + ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { + $shared_libs_used = 1; + } $mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}}); @@ -77,7 +83,13 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir}, $config::config{builddir}, "extra_cflags.txt"); - summary::show($OUTPUT, \%config::config); +if ($shared_libs_used) { + print <<EOF; +To run binaries without installing, set the following environment variable: + $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared +EOF +} + 1; Modified: branches/SAMBA_4_0/source/dsdb/config.mk =================================================================== --- branches/SAMBA_4_0/source/dsdb/config.mk 2007-11-16 20:54:13 UTC (rev 26004) +++ branches/SAMBA_4_0/source/dsdb/config.mk 2007-11-16 21:50:31 UTC (rev 26005) @@ -9,7 +9,6 @@ PUBLIC_HEADERS = samdb/samdb.h PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS -LDFLAGS = $(LIBRARY_ldb_OUTPUT) OBJ_FILES = \ samdb/samdb.o \ samdb/samdb_privilege.o \
