build tweaks - use automake's foreign mode, avoid creating empty files to satisfy gnu mode - run autoreconf -f to ensure that everything matches

This commit is contained in:
Nalin Dahyabhai 2010-11-24 17:39:46 -05:00 committed by Rob Crittenden
parent 5bfb1a004a
commit b683c7261b
6 changed files with 5 additions and 20 deletions

View File

@ -1,14 +1,3 @@
#!/bin/sh #!/bin/sh
autoreconf -i -f
# automake demands these files exist when run in gnu mode which is the default,
# automake can be run in foreign mode to avoid failing on the absence of these
# files, but unfortunately there is no way to pass the --foreign flag to
# automake when run from autoreconf.
for f in NEWS README AUTHORS ChangeLog; do
if [ ! -e $f ]; then
touch $f
fi
done
autoreconf -i
./configure ${1+"$@"} ./configure ${1+"$@"}

View File

@ -3,7 +3,7 @@ AC_INIT([ipa-client],
[0.99.0], [0.99.0],
[http://www.freeipa.org/]) [http://www.freeipa.org/])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE([foreign])
AC_SUBST(VERSION) AC_SUBST(VERSION)

View File

@ -6,7 +6,7 @@ AC_INIT([ipa-server],
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_PROG_CC AC_PROG_CC

View File

@ -7,7 +7,7 @@ AC_INIT([ipa-server],
#AC_CONFIG_SRCDIR([ipaserver/ipaldap.py]) #AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
#AC_PROG_CC #AC_PROG_CC

View File

@ -9,7 +9,7 @@ AC_PROG_LIBTOOL
AC_CONFIG_SRCDIR([ipaclient/__init__.py]) AC_CONFIG_SRCDIR([ipaclient/__init__.py])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

View File

@ -223,10 +223,6 @@ administering radius authentication settings in IPA.
export CFLAGS="$CFLAGS %{optflags}" export CFLAGS="$CFLAGS %{optflags}"
export CPPFLAGS="$CPPFLAGS %{optflags}" export CPPFLAGS="$CPPFLAGS %{optflags}"
make version-update make version-update
%if ! %{ONLY_CLIENT}
touch daemons/NEWS daemons/README daemons/AUTHORS daemons/ChangeLog
touch install/NEWS install/README install/AUTHORS install/ChangeLog
%endif
cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%if ! %{ONLY_CLIENT} %if ! %{ONLY_CLIENT}
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..