Commit fe73b556 authored by Pekka Pessi's avatar Pekka Pessi
Browse files

Using --with-aclocal and ${ACLOCAL} to get correct aclocal install directory.

darcs-hash:20050923155720-65a35-e18fff20ef0456fa43f68e44f760b7b38a7ed7df.gz
parent 10422d1c
...@@ -12,8 +12,6 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -12,8 +12,6 @@ ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = sofia-sip-ua.pc pkgconfig_DATA = sofia-sip-ua.pc
m4dir = /usr/share/aclocal
dist_m4_DATA = m4/sac-general.m4 m4/sac-su.m4 m4/sac-su2.m4 dist_m4_DATA = m4/sac-general.m4 m4/sac-su.m4 m4/sac-su2.m4
doxygen: doxygen:
......
...@@ -28,6 +28,17 @@ AC_CHECK_TOOL(AR, ar, ar) ...@@ -28,6 +28,17 @@ AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(LD, ld, ld) AC_CHECK_TOOL(LD, ld, ld)
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
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
### -------------------- ### --------------------
AC_CHECK_LIB(pthread, pthread_create) AC_CHECK_LIB(pthread, pthread_create)
......
...@@ -51,7 +51,7 @@ followed, or as required to translate it into languages other than English. ...@@ -51,7 +51,7 @@ followed, or as required to translate it into languages other than English.
%setup -q -n sofia-sip-%{version} %setup -q -n sofia-sip-%{version}
%build %build
%configure --with-pic --enable-shared --disable-dependency-tracking --includedir=%{_prefix}/include/sofia-sip %configure --with-pic --enable-shared --disable-dependency-tracking --includedir=%{_prefix}/include/sofia-sip --with-aclocal=aclocal
#make %{_smp_mflags} #make %{_smp_mflags}
make make
%{?_with_check:make check} %{?_with_check:make check}
......
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