diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-29 17:40:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:41 -0500 |
| commit | 4fa24df98ded939c68bdc95e9f09334caeeb84af (patch) | |
| tree | 156dfe96806880d1da7f944fff6a84ffcc045e59 /source4/build | |
| parent | 535d1920f887ef98d962bcd7a40eae556f8e727f (diff) | |
| download | samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.tar.gz samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.tar.xz samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.zip | |
r19507: Merge my DSO fixes branch. Building Samba's libraries as shared libraries
works again now, by specifying --enable-dso to configure.
(This used to be commit 7a01235067a4800b07b8919a6a475954bfb0b04c)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/check_ld.m4 | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4 index 515c720c069..e44c29d0e33 100644 --- a/source4/build/m4/check_ld.m4 +++ b/source4/build/m4/check_ld.m4 @@ -157,6 +157,7 @@ AC_MSG_RESULT([$SHLD]) AC_MSG_CHECKING([SHLD_FLAGS]) AC_MSG_RESULT([$SHLD_FLAGS]) +AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension]) AC_MSG_CHECKING([SHLIBEXT]) AC_MSG_RESULT([$SHLIBEXT]) AC_MSG_CHECKING([SONAMEFLAG]) diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 30ebf962e08..259256b9b5c 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -123,7 +123,7 @@ SHELL=$self->{config}->{SHELL} PERL=$self->{config}->{PERL} CPP=$self->{config}->{CPP} -CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS} +CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS} CC=$self->{config}->{CC} CFLAGS=$self->{config}->{CFLAGS} \$(CPPFLAGS) |