vapier 14/10/19 08:35:52 Modified: Makefile.am configure.ac Log: integrate python/caps support into autotools
Revision Changes Path 1.2 pax-utils/Makefile.am file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/Makefile.am?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/Makefile.am?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/Makefile.am?r1=1.1&r2=1.2 Index: Makefile.am =================================================================== RCS file: /var/cvsroot/gentoo-projects/pax-utils/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 19 Oct 2014 08:20:55 -0000 1.1 +++ Makefile.am 19 Oct 2014 08:35:52 -0000 1.2 @@ -15,13 +15,18 @@ xfuncs.c LDADD = libpaxutils.la +bin_SCRIPTS = lddtree symtree bin_PROGRAMS = scanelf dumpelf pspax scanmacho -install-exec-hook: - cd $(DESTDIR)$(bindir); \ - for applet in $(APPLETS) ; do \ - [ ! -e "$$applet" ] && ln -s q $${applet} ; \ - done +if USE_PYTHON +lddtree: lddtree.py +else +lddtree: lddtree.sh +endif + cp $< $@ + +symtree: symtree.sh + cp $< $@ TMAKE = \ $(MAKE) -C $(abs_top_srcdir)/tests \ @@ -30,15 +35,10 @@ abs_top_srcdir="$(abs_top_srcdir)" check-hook: $(TMAKE) check -clean-local: - $(TMAKE) clean - -rmdir tests/*/ tests/ - rm -f $(APPLETS) check: check-hook # Start off with base values which we append below dist_man_MANS = -APPLETS = EXTRA_DIST = autotools/m4/gnulib-cache.m4 # @@@ GEN START @@@ # 1.2 pax-utils/configure.ac file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/configure.ac?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/configure.ac?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/configure.ac?r1=1.1&r2=1.2 Index: configure.ac =================================================================== RCS file: /var/cvsroot/gentoo-projects/pax-utils/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure.ac 19 Oct 2014 08:20:55 -0000 1.1 +++ configure.ac 19 Oct 2014 08:35:52 -0000 1.2 @@ -15,6 +15,15 @@ gl_EARLY gl_INIT +AC_ARG_WITH([caps], [AS_HELP_STRING([--with-caps], [build with capabilities])]) +AS_IF([test "x$with_caps" = "xyes"], [ + CPPFLAGS="$CPPFLAGS -DWANT_SYSCAP" + LIBS="$LIBS -lcap" +]) + +AC_ARG_WITH([python], [AS_HELP_STRING([--with-python], [use lddtree.py])]) +AM_CONDITIONAL([USE_PYTHON], [test "x$with_python" = "xyes"]) + AX_CFLAGS_WARN_ALL AC_DEFUN([PT_CHECK_CFLAG],[AX_CHECK_COMPILER_FLAGS([$1],[CFLAGS="$CFLAGS $1"])]) m4_foreach_w([flag], [
