Jerry,

I've got a partial patch I'd like you to look at below.
This fixes most, if not all, the library links for the build.  Sorry,
haven't gotten to the install yet.  That may happen later.  I expanded
the patch to include the major as well as minor version numbers in the
libraries.  I also noticed a few places were the make file will generate
a library with version linkage without actually creating a link.  Don't
know if these are Windows only options or not, so I also fixed them.
A quick question also:  Would it be better to require an update to
/etc/ld.so.conf to include the path to the samba libraries or just
install in the /usr/lib directory??

--begin patch--
diff -Nurp samba-3.2.0.orig/source/Makefile.in
samba-3.2.0/source/Makefile.in
--- samba-3.2.0.orig/source/Makefile.in 2008-08-12 09:22:15.000000000
-0400
+++ samba-3.2.0/source/Makefile.in      2008-08-12 10:48:57.000000000
-0400
@@ -27,7 +27,8 @@ [EMAIL PROTECTED]@
 ## Dynamic shared libraries build settings
 DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ |
sed 's/@[EMAIL PROTECTED]/@SYM                           SEXT@/'`
 [EMAIL PROTECTED]@
-SONAME_VER=`grep \^$@ $(builddir)/library-versions | cut -d: -f2`
+SONAME_MVER=`grep \^$@ $(builddir)/library-versions | cut -d: -f2`
+SONAME_SVER=`grep \^$@ $(builddir)/library-versions | cut -d: -f3`
 SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@

 # The MODULE_EXPORTS variable contains the platform-specific linker
flags
@@ -1597,9 +1598,9 @@ $(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
 $(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ)
$(LIBTALLOC_SYMS)
        @echo Linking shared library $@
        @$(SHLD_DSO) $(LIBTALLOC_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
-       @rm -f [EMAIL PROTECTED](SONAME_VER)
-       @ln -s -f `basename [EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
        @echo Linking non-shared library $@
@@ -1611,9 +1612,9 @@ $(LIBTDB_SYMS): $(LIBTDB_HEADERS)
 $(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
        @echo Linking shared library $@
        @$(SHLD_DSO) $(LIBTDB_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
-       @rm -f [EMAIL PROTECTED](SONAME_VER)
-       @ln -s -f `basename [EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
        @echo Linking non-shared library $@
@@ -1625,9 +1626,9 @@ $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADE
 $(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
$(LIBWBCLIENT_SYMS) @LIBTAL                           LOC_SHARED@
        @echo Linking shared library $@
        @$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
-       @rm -f [EMAIL PROTECTED](SONAME_VER)
-       @ln -s -f `basename [EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0)
$(WBCOMMON_OBJ)
        @echo Linking non-shared library $@
@@ -1637,7 +1638,9 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQ
        @echo Linking shared library $@
        @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
                $(KRB5LIBS) $(UUID_LIBS) $(LIBTALLOC_LIBS) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
        @echo Linking non-shared library $@
@@ -1651,9 +1654,9 @@ $(LIBNETAPI_SHARED_TARGET): $(BINARY_PRE
        @$(SHLD_DSO) $(LIBNETAPI_OBJ) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS)
\
                $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
-       @rm -f [EMAIL PROTECTED](SONAME_VER)
-       @ln -s -f `basename [EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
        @echo Linking non-shared library $@
@@ -1664,7 +1667,9 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PR
        @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS)
\
                $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
        @echo Linking non-shared library $@
@@ -1675,7 +1680,9 @@ bin/[EMAIL PROTECTED]@: $(BINAR
        @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
                $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
+               @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @mv $@ [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER)
+       @ln -s -f `basename [EMAIL PROTECTED](SONAME_MVER).$(SONAME_SVER) $@

 bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
        @echo Linking non-shared library $@
--end patch--


----
James Kosin


International Communications Group, Inc.
230 Pickett's Line
Newport News, VA  23603

Phone: +1 (757) 947-1030 ext 122
Fax: +1 (757) 947-1035



--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

Reply via email to