SPECS: db4.4.spec - IMHO better handling of without_static_libs

[witekfl]

Author: witekfl                      Date: Wed Apr 19 17:41:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- IMHO better handling of without_static_libs

---- Files affected:
SPECS:
   db4.4.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/db4.4.spec
diff -u SPECS/db4.4.spec:1.4 SPECS/db4.4.spec:1.5
--- SPECS/db4.4.spec:1.4	Mon Feb 20 22:02:27 2006
+++ SPECS/db4.4.spec	Wed Apr 19 19:41:20 2006
@@ -255,6 +255,7 @@
 sh s_config
 cd ..
 
+%if %{with static_libs}
 cp -a build_unix build_unix.static
 
 cd build_unix.static
@@ -272,15 +273,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} \
@@ -293,8 +295,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}' \
@@ -308,9 +309,11 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
 
+%if %{with static_libs}
 %{__make} -C build_unix.static library_install \
 	docdir=%{_docdir}/db-%{version}-docs \
 	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
 %{__make} -C build_unix library_install \
 	docdir=%{_docdir}/db-%{version}-docs \
@@ -488,6 +491,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/04/19 17:41:20  witekfl
+- IMHO better handling of without_static_libs
+
 Revision 1.4  2006/02/20 21:02:27  qboosh
 - updated to 4.4.20 + 2 official patches
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db4.4.spec?r1=1.4&r2=1.5&f=u