Commit 19a880ab authored by Pekka Pessi's avatar Pekka Pessi

configure.ac: m4dir is no more used

darcs-hash:20061205154448-65a35-890f10d8bf4709decec7471ea10442ed1ce850e4.gz
parent 7ad99952
...@@ -56,16 +56,6 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") ...@@ -56,16 +56,6 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen], [echo]) AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen], [echo])
AM_CONDITIONAL([HAVE_DOXYGEN], [test $DOXYGEN = doxygen]) AM_CONDITIONAL([HAVE_DOXYGEN], [test $DOXYGEN = doxygen])
AC_ARG_WITH([aclocal],
[ --with-aclocal Install m4 files in aclocal --print-ac-dir],
[if test "$with_aclocal" = "yes" ; then
m4dir=`$ACLOCAL --print-ac-dir`
else
m4dir=`$with_aclocal --print-ac-dir`
fi], [m4dir='${datadir}/aclocal'])
AC_SUBST([m4dir])
### checks for libraries ### checks for libraries
### -------------------- ### --------------------
......
# #
# Template for Sofia SIP UA RPM spec file # Template for Sofia SIP UA RPM spec file. @AUTO@
# #
%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
# Options: # Options:
# --with doxygen - Generate documents using doxygen and dot # --with doxygen - Generate documents using doxygen and dot
# --with check - Run tests # --with check - Run tests
# --with openssl - Always use OpenSSL (TLS) # --with openssl - Always use OpenSSL (TLS)
# --with glib - Always use glib-2.0 (>= 2.2) # --with glib - Always use glib-2.0 (>= 2.2)
# --with gobject - Always use gobject (>= 2.4)
# --with sctp - with SCTP # --with sctp - with SCTP
# #
...@@ -13,18 +18,19 @@ Summary: Sofia SIP User-Agent library ...@@ -13,18 +18,19 @@ Summary: Sofia SIP User-Agent library
Name: sofia-sip Name: sofia-sip
Version: @VERSION@ Version: @VERSION@
Release: 1%{?dist} Release: 1%{?dist}
License: Lesser GNU Public License 2.1 License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://sf.net/projects/sofia-sip URL: http://sf.net/projects/sofia-sip
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Packager: Pekka.Pessi@Nokia.com
%define have_doxygen %{?_with_doxygen:1}%{?!_with_doxygen:0} BuildRequires: pkgconfig
%define have_openssl %(%{?!_with_openssl:pkg-config 'openssl >= 0.9.7'&&}echo 1||echo 0) %define have_openssl %(%{?!_with_openssl:pkg-config 'openssl >= 0.9.7'&&}echo 1||echo 0)
%define have_glib %(%{?!_with_glib:pkg-config 'glib-2.0 >= 2.2'&&}echo 1||echo 0) %define have_glib %(%{?!_with_glib:pkg-config 'glib-2.0 >= 2.2'&&}echo 1||echo 0)
%define have_gobject %(%{?!_with_gobject:pkg-config 'gobject >= 2.4'&&}echo 1||echo 0)
%if %{have_doxygen} %if %{with doxygen}
BuildRequires: doxygen >= 1.3 BuildRequires: doxygen >= 1.3
%endif %endif
%if %{have_openssl} %if %{have_openssl}
...@@ -43,7 +49,7 @@ network elements. ...@@ -43,7 +49,7 @@ network elements.
%build %build
options="--with-aclocal=aclocal --disable-dependency-tracking" options="--with-aclocal=aclocal --disable-dependency-tracking"
options="$options --with-pic --enable-shared" options="$options --with-pic --enable-shared --disable-static"
%if !%{have_glib} %if !%{have_glib}
options="$options --without-glib" options="$options --without-glib"
%endif %endif
...@@ -52,26 +58,35 @@ options="$options --without-glib" ...@@ -52,26 +58,35 @@ options="$options --without-glib"
make %{_smp_mflags} make %{_smp_mflags}
%{?_with_check:make check} %{?_with_check:make check}
%if %{have_doxygen} %if %{with doxygen}
make doxygen make doxygen
%endif %endif
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
%if %{have_doxygen}
find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;
%if %{with doxygen}
# Manually install development docs into manual
cp -p -r libsofia-sip-ua/docs/html manual cp -p -r libsofia-sip-ua/docs/html manual
%endif %endif
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_prefix}/%{_lib}/libsofia-sip-ua.so.* %{_prefix}/%{_lib}/libsofia-sip-ua.so.*
%doc AUTHORS COPYING COPYRIGHTS README %doc AUTHORS COPYING COPYRIGHTS README
# note: soname in pkgname allows install of multiple library versions # note: soname in pkgname allows install of multiple library versions
# The glib interface is still a bit unstable...
%package glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@ %package glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@
Summary: GLIB bindings for Sofia-SIP Summary: GLIB bindings for Sofia-SIP
Group: System Environment/Libraries Group: System Environment/Libraries
...@@ -87,6 +102,10 @@ GLib interface to Sofia SIP User Agent library. ...@@ -87,6 +102,10 @@ GLib interface to Sofia SIP User Agent library.
%files glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@ %files glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_prefix}/%{_lib}/libsofia-sip-ua-glib.so.* %{_prefix}/%{_lib}/libsofia-sip-ua-glib.so.*
%doc AUTHORS COPYING COPYRIGHTS README libsofia-sip-ua-glib/ChangeLog
%post glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@ -p /sbin/ldconfig
%postun glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@ -p /sbin/ldconfig
%endif %endif
...@@ -95,10 +114,15 @@ Summary: Sofia-SIP Development Package ...@@ -95,10 +114,15 @@ Summary: Sofia-SIP Development Package
Group: Development/Libraries Group: Development/Libraries
Requires: sofia-sip = %{version}-%{release} Requires: sofia-sip = %{version}-%{release}
Obsoletes: sofia-devel Obsoletes: sofia-devel
Provides: sofia-devel
Requires: pkgconfig
%description devel %description devel
Development package for Sofia SIP UA library. This package includes Development package for Sofia SIP UA library. This package includes
static libraries and include files. static libraries and include files.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_prefix}/include/sofia-sip*/sofia-sip/*.h %{_prefix}/include/sofia-sip*/sofia-sip/*.h
...@@ -106,8 +130,8 @@ static libraries and include files. ...@@ -106,8 +130,8 @@ static libraries and include files.
%{_prefix}/include/sofia-sip*/sofia-sip/*.h.in %{_prefix}/include/sofia-sip*/sofia-sip/*.h.in
%{_prefix}/share/sofia-sip/tag_dll.awk %{_prefix}/share/sofia-sip/tag_dll.awk
%{_prefix}/share/sofia-sip/msg_parser.awk %{_prefix}/share/sofia-sip/msg_parser.awk
%{_prefix}/%{_lib}/libsofia-sip-ua.la # %{_prefix}/%{_lib}/libsofia-sip-ua.la
%{_prefix}/%{_lib}/libsofia-sip-ua.a # %{_prefix}/%{_lib}/libsofia-sip-ua.a
%{_prefix}/%{_lib}/libsofia-sip-ua.so %{_prefix}/%{_lib}/libsofia-sip-ua.so
%{_prefix}/%{_lib}/pkgconfig/sofia-sip-ua.pc %{_prefix}/%{_lib}/pkgconfig/sofia-sip-ua.pc
%doc TODO README.developers %doc TODO README.developers
...@@ -118,29 +142,35 @@ Summary: GLIB bindings for Sofia SIP development files ...@@ -118,29 +142,35 @@ Summary: GLIB bindings for Sofia SIP development files
Group: Development/Libraries Group: Development/Libraries
Requires: sofia-sip-glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@ = %{version}-%{release} Requires: sofia-sip-glib@LIBVER_SOFIA_SIP_UA_GLIB_SOVER@ = %{version}-%{release}
Requires: sofia-sip-devel >= 1.12 Requires: sofia-sip-devel >= 1.12
%if %{have_gobject}
BuildRequires: glib2-devel >= 2.4
%endif
%if %{have_glib}
BuildRequires: glib2-devel >= 2.2
%endif
%description glib-devel %description glib-devel
Development package for Sofia SIP UA Glib library. This package includes Development package for Sofia SIP UA Glib library. This package includes
pstatic libraries and include files for developing glib programs using Sofia static libraries and include files for developing glib programs using Sofia
SIP. SIP.
%if %{have_glib} %if %{have_glib}
%files glib-devel %files glib-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_prefix}/include/sofia-sip*/sofia-sip/su_source.h %{_prefix}/include/sofia-sip*/sofia-sip/su_source.h
%{_prefix}/%{_lib}/libsofia-sip-ua-glib.la # %{_prefix}/%{_lib}/libsofia-sip-ua-glib.la
%{_prefix}/%{_lib}/libsofia-sip-ua-glib.a # %{_prefix}/%{_lib}/libsofia-sip-ua-glib.a
%{_prefix}/%{_lib}/libsofia-sip-ua-glib.so %{_prefix}/%{_lib}/libsofia-sip-ua-glib.so
%{_prefix}/%{_lib}/pkgconfig/sofia-sip-ua-glib.pc %{_prefix}/%{_lib}/pkgconfig/sofia-sip-ua-glib.pc
%endif %endif
%package docs %package docs
Summary: Sofia-SIP Development Manual Package Summary: Sofia-SIP Development Manual Package
Group: Development/Libraries Group: Documentation
%description docs %description docs
HTML reference documentation for Sofia SIP UA library. HTML reference documentation for Sofia SIP UA library.
%if %{have_doxygen} %if %{with doxygen}
%files docs %files docs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc manual %doc manual
...@@ -148,9 +178,10 @@ HTML reference documentation for Sofia SIP UA library. ...@@ -148,9 +178,10 @@ HTML reference documentation for Sofia SIP UA library.
%package utils %package utils
Summary: Sofia-SIP Command Line Utilities Summary: Sofia-SIP Command Line Utilities
Group: Development/Libraries Group: Applications/Internet
Requires: sofia-sip = %{version}-%{release} Requires: sofia-sip = %{version}-%{release}
Obsoletes: sofia-utils Obsoletes: sofia-utils
Provides: sofia-utils
%description utils %description utils
Command line utilities for Sofia SIP UA library. Command line utilities for Sofia SIP UA library.
...@@ -165,40 +196,36 @@ Command line utilities for Sofia SIP UA library. ...@@ -165,40 +196,36 @@ Command line utilities for Sofia SIP UA library.
%{_mandir}/man?/* %{_mandir}/man?/*
%changelog %changelog
* Tue Dec 5 2006 Kai Vehmanen
- The 'nua-glib' module, and the related dependency to gobject, has been
removed from the sofia-sip package
* Fri Oct 6 2006 Pekka Pessi * Fri Oct 6 2006 Pekka Pessi
- Autodetecting openssl, glib and gobject support with pkg-config - Autodetecting openssl, glib and gobject support with pkg-config
(use --with openssl --with glib and --with gobject to force them) (use --with openssl --with glib and --with gobject to force them)
* Mon Sep 18 2006 Kai Vehmanen <kai.vehmanen@nokia.com> * Mon Sep 18 2006 Kai Vehmanen <first.lastname at nokia.com>
- Removed *.m4 files from the distribution package. - Removed *.m4 files from the distribution package.
* Fri Aug 11 2006 Kai Vehmanen <kai.vehmanen@nokia.com> * Fri Aug 11 2006 Kai Vehmanen <first.lastname at nokia.com>
- Modified the install location of the awk scripts. - Modified the install location of the awk scripts.
* Thu Jun 15 2006 Kai Vehmanen <kai.vehmanen@nokia.com> * Thu Jun 15 2006 Kai Vehmanen <first.lastname at nokia.com>
- Added library soname to sofia-sip-glib package name. - Added library soname to sofia-sip-glib package name.
- Modified dependencies - the glib subpackages do not depend - Modified dependencies - the glib subpackages do not depend
on a specific version of sofia-sip anymore. on a specific version of sofia-sip anymore.
* Wed Mar 08 2006 Kai Vehmanen <kai.vehmanen@nokia.com> * Wed Mar 08 2006 Kai Vehmanen <first.lastname at nokia.com>
- Added libsofia-sip-ua-glib to the package. - Added libsofia-sip-ua-glib to the package.
* Tue Nov 15 2005 Kai Vehmanen <kai.vehmanen@nokia.com> * Tue Nov 15 2005 Kai Vehmanen <first.lastname at nokia.com>
- Removed the --includedir parameter. The public headers are - Removed the --includedir parameter. The public headers are
now installed under includedir/sofia-sip-MAJOR.MINOR/ now installed under includedir/sofia-sip-MAJOR.MINOR/
* Thu Oct 20 2005 Pekka Pessi <Pekka.Pessi@nokia.com> * Thu Oct 20 2005 Pekka Pessi <first.lastname at nokia.com>
- Using %{_lib} instead of lib - Using %{_lib} instead of lib
* Thu Oct 6 2005 Pekka Pessi <Pekka.Pessi@iki.fi> * Thu Oct 6 2005 Pekka Pessi <first.lastname at nokia.com>
- Added sub-package utils - Added sub-package utils
* Thu Oct 6 2005 Pekka Pessi <Pekka.Pessi@nokia.com> - 1.11.0 * Thu Oct 6 2005 Pekka Pessi <first.lastname at nokia.com> - 1.11.0
- Added %%{?dist} to release - Added %%{?dist} to release
* Sat Jul 23 2005 Pekka Pessi <Pekka.Pessi@nokia.com> - 1.10.1 * Sat Jul 23 2005 Pekka Pessi <first.lastname at nokia.com> - 1.10.1
- Initial build. - Initial build.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment