diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 18:59:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 18:59:57 +0100 |
| commit | 501005c2eb3de794f72121d62bf7769e9109a032 (patch) | |
| tree | c5df12fe6f8f08bfdf1564e3c9e253052a394009 /source4/configure.ac | |
| parent | 8a3f8dc646585c1861ac7322ad67a93353fa0c71 (diff) | |
| download | samba-501005c2eb3de794f72121d62bf7769e9109a032.tar.gz samba-501005c2eb3de794f72121d62bf7769e9109a032.tar.bz2 samba-501005c2eb3de794f72121d62bf7769e9109a032.zip | |
Put soversions and versions for libraries with a hard-coded version in the
generated .mk file.
Move CPPFLAGS to be generated entirely inside configure.ac (simplifies
makefile.pm).
(This used to be commit a44af7c3872e900e1ea0da74ef796213030e29ac)
Diffstat (limited to 'source4/configure.ac')
| -rw-r--r-- | source4/configure.ac | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 0a59e41b03..17925dfa99 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -138,6 +138,25 @@ for d in build/smb_build bin include ; do test -d ${builddir}/$d || AS_MKDIR_P(${builddir}/$d) done +AC_SUBST(INTERN_LDFLAGS) +AC_SUBST(INSTALL_LINK_FLAGS) +if test $USESHARED = "true"; +then + INTERN_LDFLAGS="-L\${builddir}/bin/shared" + INSTALL_LINK_FLAGS="-Wl,-rpath-link,\${builddir}/bin/shared"; +else + INTERN_LDFLAGS="-L\${builddir}/bin/static" +fi + +builddir_headers="" + +if test "x$ac_abs_srcdir" != "x$ac_abs_builddir" +then + builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib "; +fi + +CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS" + echo "configure: creating build/smb_build/config.pm" cat >build/smb_build/config.pm<<CEOF # config.pm - Autogenerate by configure. DO NOT EDIT! |