diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-23 11:39:23 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-05-23 17:19:55 +0200 |
| commit | ef0dd8850bc8504afbf4dabdab4a7286f384d229 (patch) | |
| tree | 3a552693094c44b1376a913686392d932df2b436 | |
| parent | 34104dfc21e85dd37f96ca7d381d5b033b62936e (diff) | |
| download | samba-ef0dd8850bc8504afbf4dabdab4a7286f384d229.tar.gz samba-ef0dd8850bc8504afbf4dabdab4a7286f384d229.tar.bz2 samba-ef0dd8850bc8504afbf4dabdab4a7286f384d229.zip | |
build: pass .syms extention via @SYMSEXT@ from configure
metze
(cherry picked from commit efb23fdce72db48b4c149fb3dd4a6f4aa3eebbbe)
(This used to be commit 3bf5a047e3d478b3356df7aa5c4f4a9d0b763639)
| -rw-r--r-- | source3/Makefile.in | 6 | ||||
| -rw-r--r-- | source3/configure.in | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 530ccb1e06..56aa92461b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -25,7 +25,7 @@ SHLD=@SHLD@ LIB_PATH_VAR=@LIB_PATH_VAR@ ## Dynamic shared libraries build settings -DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@$$/syms/'` +DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@$$/@SYMSEXT@/'` DSO_EXPORTS=@DSO_EXPORTS@ SONAME_VER=`grep \^$@ $(builddir)/library-versions | cut -d: -f2` SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@ @@ -150,7 +150,7 @@ LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@ LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@ -LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms +LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@ LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ @@ -161,7 +161,7 @@ LIBWBCLIENT=@LIBWBCLIENT_SHARED@ LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@ LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@ LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@ -LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.syms +LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@ LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) diff --git a/source3/configure.in b/source3/configure.in index d63ef613a8..561e2278b0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1500,6 +1500,10 @@ EOF fi fi +# Set defaults +SYMSEXT="syms" +AC_SUBST(SYMSEXT) + # Assume non-shared by default and override below BLDSHARED="false" |