Skip to content

Commit

Permalink
build tweaks - use automake's foreign mode, avoid creating empty file…
Browse files Browse the repository at this point in the history
…s to satisfy gnu mode - run autoreconf -f to ensure that everything matches
  • Loading branch information
nalind authored and rcritten committed Nov 29, 2010
1 parent 5bfb1a0 commit b683c72
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 20 deletions.
13 changes: 1 addition & 12 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
#!/bin/sh

# 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
autoreconf -i -f
./configure ${1+"$@"}
2 changes: 1 addition & 1 deletion contrib/RHEL4/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_INIT([ipa-client],
[0.99.0],
[http://www.freeipa.org/])

AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])

AC_SUBST(VERSION)

Expand Down
2 changes: 1 addition & 1 deletion daemons/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AC_INIT([ipa-server],

AC_CONFIG_HEADERS([config.h])

AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])

AM_MAINTAINER_MODE
AC_PROG_CC
Expand Down
2 changes: 1 addition & 1 deletion install/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AC_INIT([ipa-server],
#AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])
AC_CONFIG_HEADERS([config.h])

AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])

AM_MAINTAINER_MODE
#AC_PROG_CC
Expand Down
2 changes: 1 addition & 1 deletion ipa-client/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AC_PROG_LIBTOOL
AC_CONFIG_SRCDIR([ipaclient/__init__.py])
AC_CONFIG_HEADERS([config.h])

AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])

AM_MAINTAINER_MODE

Expand Down
4 changes: 0 additions & 4 deletions ipa.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ administering radius authentication settings in IPA.
export CFLAGS="$CFLAGS %{optflags}"
export CPPFLAGS="$CPPFLAGS %{optflags}"
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 ..
%if ! %{ONLY_CLIENT}
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
Expand Down

0 comments on commit b683c72

Please sign in to comment.