diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-23 01:07:55 +0100 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-04-25 15:27:52 +0000 |
| commit | bbea6a1c9f58d7f87424e0df6f9821d8ef1d3b00 (patch) | |
| tree | 207a471184be93fc8a054f1431fc7a0f6ffd0118 | |
| parent | 17e4998a47c72246063de98828599c4fa079a94e (diff) | |
autotools: use AM_CONDITIONAL for rpm build rule
Change-Id: Ia97966e28cf7d061694336fb00b9a0790f0d57bb
Reviewed-on: https://code.wireshark.org/review/15067
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | acinclude.m4 | 20 | ||||
| -rw-r--r-- | configure.ac | 18 |
3 files changed, 30 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index 677916d020..72b598fa12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -968,20 +968,20 @@ svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm rpm-package: dist - @if test x$(HAVE_RPM) = xyes ; then \ - cd $(rpm_topdir) ; \ - mkdir -p BUILD RPMS SOURCES SRPMS; \ - cd SOURCES ; \ - ln -sf ../../../$(distdir).tar.bz2 ; \ - cd .. ; \ - rpmbuild --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \ - @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \ - echo "Package successfully built in `pwd`/RPMS." && \ - rm -f SOURCES/$(distdir).tar.bz2 $(distdir).tar.bz2 ; \ - else \ - echo "Error: RPM executable and/or source directory not found." ; \ - false; \ - fi +if HAVE_RPM + @cd $(rpm_topdir) && \ + mkdir -p BUILD RPMS SOURCES SRPMS && \ + cd SOURCES && \ + ln -sf ../../../$(distdir).tar.bz2 && \ + cd .. && \ + $(RPMBUILD) --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \ + @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \ + echo "Package successfully built in `pwd`/RPMS." ; \ + rm -f SOURCES/$(distdir).tar.bz2 $(distdir).tar.bz2 +else + @echo "RPM executable not available." ; \ + false +endif # XXX - This assumes we're building from the source directory. osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist diff --git a/acinclude.m4 b/acinclude.m4 index fa1ebc40c7..f1fe4bde36 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -790,26 +790,6 @@ AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[ AC_WIRESHARK_POP_FLAGS ]) -# -# AC_WIRESHARK_RPM_CHECK -# Looks for the rpm program, and checks to see if we can redefine "_topdir". -# -AC_DEFUN([AC_WIRESHARK_RPM_CHECK], -[ - AC_CHECK_PROG(ac_cv_wireshark_have_rpm, rpm, "yes", "no") - if test "x$ac_cv_wireshark_have_rpm" = "xyes"; then - rpm --define '_topdir /tmp' > /dev/null 2>&1 - AC_MSG_CHECKING(to see if we can redefine _topdir) - if test $? -eq 0 ; then - AC_MSG_RESULT(yes) - HAVE_RPM=yes - else - AC_MSG_RESULT(no. You'll have to build packages manually.) - HAVE_RPM=no - fi - fi -]) - # # AC_WIRESHARK_C_ARES_CHECK diff --git a/configure.ac b/configure.ac index 56da2c4270..1364962c8f 100644 --- a/configure.ac +++ b/configure.ac @@ -779,8 +779,22 @@ fi AC_SUBST(HAVE_SVR4_PACKAGING) # RPM -AC_WIRESHARK_RPM_CHECK -AC_SUBST(HAVE_RPM) +# +# Looks for the rpmbuild program, and checks to see if we can redefine "_topdir". +# +AC_CHECK_PROGS(RPMBUILD, [rpmbuild], [false]) +if test "x$RPMBUILD" != "xfalse" ; then + AC_MSG_CHECKING([to see if we can redefine _topdir]) + $RPMBUILD --define '_topdir /tmp' > /dev/null 2>&1 + if test $? -eq 0 ; then + AC_MSG_RESULT(yes) + have_rpm=yes + else + AC_MSG_RESULT([no, you'll have to build packages manually]) + have_rpm=no + fi +fi +AM_CONDITIONAL(HAVE_RPM, [test "x$have_rpm" = xyes]) # Debian AC_CHECK_PROG(HAVE_DPKG_BUILDPACKAGE, dpkg-buildpackage, "yes", "no") |