packages: db4.3/db4.3.spec - fixed static_libs bcond (from db4.4)

[qboosh]

Author: qboosh                       Date: Sat Dec 10 21:52:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed static_libs bcond (from db4.4)

---- Files affected:
packages/db4.3:
   db4.3.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/db4.3/db4.3.spec
diff -u packages/db4.3/db4.3.spec:1.21 packages/db4.3/db4.3.spec:1.22
--- packages/db4.3/db4.3.spec:1.21	Sat Dec 10 08:12:06 2011
+++ packages/db4.3/db4.3.spec	Sat Dec 10 22:52:22 2011
@@ -286,6 +286,7 @@
 sh s_config
 cd ..
 
+%if %{with static_libs}
 cp -a build_unix build_unix.static
 
 cd build_unix.static
@@ -303,15 +304,16 @@
 	--enable-static \
 	--enable-rpc \
 	--%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
-	--enable-cxx \
-	%{!?with_static_libs:--disable-static}
+	--enable-cxx
 
 # (temporarily?) disabled because of compilation errors:
 #	--enable-dump185 \
 
 %{__make} library_build
+cd ..
+%endif
 
-cd ../build_unix
+cd build_unix
 
 ../dist/%configure \
 	--prefix=%{_prefix} \
@@ -324,8 +326,7 @@
 	%{?with_tcl:--with-tcl=/usr/lib} \
 	%{?with_java:--enable-java} \
 	--disable-static \
-	--enable-shared \
-	%{!?with_static_libs:--disable-static}
+	--enable-shared
 
 %{__make} library_build \
 	TCFLAGS='-I$(builddir) -I%{_includedir}' \
@@ -339,10 +340,12 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
 
+%if %{with static_libs}
 %{__make} -C build_unix.static library_install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	docdir=%{_docdir}/db-%{version}-docs \
 	includedir=%{_includedir}
+%endif
 
 %{__make} -C build_unix library_install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -545,6 +548,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/12/10 21:52:22  qboosh
+- fixed static_libs bcond (from db4.4)
+
 Revision 1.21  2011/12/10 07:12:06  qboosh
 - added default_db bcond (now disabled by default)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.3/db4.3.spec?r1=1.21&r2=1.22&f=u