diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2010-11-24 17:39:46 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-11-29 11:39:55 -0500 |
| commit | b683c7261bcadc6899168d7cff8bd218a3501ba6 (patch) | |
| tree | f9731ca0324ed33135b97b717458f734cc9fe6af | |
| parent | 5bfb1a004a9c6828c5b6a002d15f7eeb2ce14c9a (diff) | |
| download | freeipa-b683c7261bcadc6899168d7cff8bd218a3501ba6.tar.gz freeipa-b683c7261bcadc6899168d7cff8bd218a3501ba6.tar.xz freeipa-b683c7261bcadc6899168d7cff8bd218a3501ba6.zip | |
build tweaks - use automake's foreign mode, avoid creating empty files to satisfy gnu mode - run autoreconf -f to ensure that everything matches
| -rwxr-xr-x | autogen.sh | 13 | ||||
| -rw-r--r-- | contrib/RHEL4/configure.ac | 2 | ||||
| -rw-r--r-- | daemons/configure.ac | 2 | ||||
| -rw-r--r-- | install/configure.ac | 2 | ||||
| -rw-r--r-- | ipa-client/configure.ac | 2 | ||||
| -rw-r--r-- | ipa.spec.in | 4 |
6 files changed, 5 insertions, 20 deletions
diff --git a/autogen.sh b/autogen.sh index 99b4805d0..5eab4a499 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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+"$@"} diff --git a/contrib/RHEL4/configure.ac b/contrib/RHEL4/configure.ac index 83676a37f..1fd3fd239 100644 --- a/contrib/RHEL4/configure.ac +++ b/contrib/RHEL4/configure.ac @@ -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) diff --git a/daemons/configure.ac b/daemons/configure.ac index da86557d2..d959f987a 100644 --- a/daemons/configure.ac +++ b/daemons/configure.ac @@ -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 diff --git a/install/configure.ac b/install/configure.ac index 5cdfb791e..2424ef29f 100644 --- a/install/configure.ac +++ b/install/configure.ac @@ -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 diff --git a/ipa-client/configure.ac b/ipa-client/configure.ac index 95becd352..75544ae75 100644 --- a/ipa-client/configure.ac +++ b/ipa-client/configure.ac @@ -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 diff --git a/ipa.spec.in b/ipa.spec.in index b43aa8e65..775c52ed2 100644 --- a/ipa.spec.in +++ b/ipa.spec.in @@ -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 .. |