- IMHO better handling of without_static_libs

[packages/db4.4.git] / db4.4.spec

diff --git a/db4.4.spec b/db4.4.spec
index b7d672c8919bf96089add2ab07da2ba35940acc2..554bbbbc555a51a3013b7ba7bd4542e355e8d34d 100644 (file)
--- a/db4.4.spec
+++ b/db4.4.spec
@@ -254,6 +254,7 @@ cp -f /usr/share/libtool/ltmain.sh .
 sh s_config
 cd ..
 
+%if %{with static_libs}
 cp -a build_unix build_unix.static
 
 cd build_unix.static
@@ -271,15 +272,16 @@ export CC CXX CFLAGS CXXFLAGS LDFLAGS
        --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} \
@@ -292,8 +294,7 @@ cd ../build_unix
        %{?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}' \
@@ -307,9 +308,11 @@ install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/%{_lib}}
 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 \