Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 719438
Collapse All | Expand All

(-)a/configure.ac (-31 / +31 lines)
Lines 225-231 Link Here
225
# Compiling without fPIE by default (see PR 9922)
225
# Compiling without fPIE by default (see PR 9922)
226
AC_ARG_ENABLE([pie],
226
AC_ARG_ENABLE([pie],
227
  [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
227
  [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
228
AS_IF([test "x$enable_pie" == xyes],[
228
AS_IF([test "x$enable_pie" = xyes],[
229
   PIECFLAGS='-fPIE'
229
   PIECFLAGS='-fPIE'
230
   PIECXXFLAGS='-fPIE'
230
   PIECXXFLAGS='-fPIE'
231
   PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
231
   PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
Lines 271-277 Link Here
271
  AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
271
  AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
272
  [],
272
  [],
273
  [enable_translator="yes"])
273
  [enable_translator="yes"])
274
AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
274
AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
275
275
276
dnl Handle the option to build the crash extension
276
dnl Handle the option to build the crash extension
277
AC_ARG_ENABLE([crash],
277
AC_ARG_ENABLE([crash],
Lines 312-336 Link Here
312
AC_CHECK_PROG(have_dvips, dvips, yes, no)
312
AC_CHECK_PROG(have_dvips, dvips, yes, no)
313
AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
313
AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
314
if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
314
if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
315
   if test "$enable_docs" == "yes"; then
315
   if test "$enable_docs" = "yes"; then
316
      AC_MSG_ERROR([cannot find all tools for building documentation])
316
      AC_MSG_ERROR([cannot find all tools for building documentation])
317
   fi
317
   fi
318
  if test "$enable_docs" == "check"; then
318
  if test "$enable_docs" = "check"; then
319
    AC_MSG_WARN([will not build documentation, cannot find all tools])
319
    AC_MSG_WARN([will not build documentation, cannot find all tools])
320
  fi
320
  fi
321
fi
321
fi
322
if test "$enable_docs" == "prebuilt"; then
322
if test "$enable_docs" = "prebuilt"; then
323
  AC_MSG_NOTICE([will only install prebuilt documentation])
323
  AC_MSG_NOTICE([will only install prebuilt documentation])
324
fi
324
fi
325
if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
325
if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
326
   building_docs="yes"
326
   building_docs="yes"
327
   installing_prebuilt_docs="yes"
327
   installing_prebuilt_docs="yes"
328
fi
328
fi
329
if test "$enable_docs" == "no"; then
329
if test "$enable_docs" = "no"; then
330
   installing_prebuilt_docs="no"
330
   installing_prebuilt_docs="no"
331
fi
331
fi
332
AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
332
AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
333
AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
333
AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
334
334
335
335
336
dnl Handle the option to build the reference documentation
336
dnl Handle the option to build the reference documentation
Lines 340-356 Link Here
340
    [enable building reference documentation (default on if other documentation built).]),
340
    [enable building reference documentation (default on if other documentation built).]),
341
  [enable_refdocs=$enableval],
341
  [enable_refdocs=$enableval],
342
  [enable_refdocs="check"])
342
  [enable_refdocs="check"])
343
if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
343
if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
344
   AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
344
   AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
345
fi
345
fi
346
if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
346
if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
347
   building_refdocs="yes"
347
   building_refdocs="yes"
348
fi
348
fi
349
AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
349
AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
350
350
351
AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
351
AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
352
AC_CHECK_PROG(have_fop, fop, yes, no)
352
AC_CHECK_PROG(have_fop, fop, yes, no)
353
if test "x${have_fop}" == "xyes"; then
353
if test "x${have_fop}" = "xyes"; then
354
   # Due to rhbz505364 / 830266, we must actually test-run fop, not just
354
   # Due to rhbz505364 / 830266, we must actually test-run fop, not just
355
   # hope that it works.
355
   # hope that it works.
356
   AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
356
   AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
Lines 362-369 Link Here
362
   fi
362
   fi
363
   rm -f dummy-tapsets.pdf
363
   rm -f dummy-tapsets.pdf
364
fi
364
fi
365
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
365
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
366
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
366
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
367
367
368
dnl Handle the option to build the html documentation
368
dnl Handle the option to build the html documentation
369
building_htmldocs="no"
369
building_htmldocs="no"
Lines 372-382 Link Here
372
    [enable building html documentation (default off).]),
372
    [enable building html documentation (default off).]),
373
    [building_htmldocs=$enableval],
373
    [building_htmldocs=$enableval],
374
    [building_htmldocs="no"])
374
    [building_htmldocs="no"])
375
if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
375
if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
376
   AC_MSG_ERROR([xmlto required for building html documentation])
376
   AC_MSG_ERROR([xmlto required for building html documentation])
377
fi
377
fi
378
378
379
AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
379
AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
380
380
381
dnl There is a strange bug in older versions of xmlto when generating pdf.
381
dnl There is a strange bug in older versions of xmlto when generating pdf.
382
dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
382
dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
Lines 396-405 Link Here
396
   </book>
396
   </book>
397
EOF
397
EOF
398
398
399
if test "x${have_xmlto}" == "xyes"; then
399
if test "x${have_xmlto}" = "xyes"; then
400
AC_MSG_CHECKING([for xmlto --stringparam support])
400
AC_MSG_CHECKING([for xmlto --stringparam support])
401
   xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
401
   xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
402
   if test $? == 0; then
402
   if test $? = 0; then
403
      have_xmlto_stringparam="yes"
403
      have_xmlto_stringparam="yes"
404
      AC_MSG_RESULT([yes])
404
      AC_MSG_RESULT([yes])
405
   else
405
   else
Lines 407-413 Link Here
407
   fi
407
   fi
408
   rm -f conftest.html
408
   rm -f conftest.html
409
fi
409
fi
410
AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
410
AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
411
411
412
rm -f conftest.xml
412
rm -f conftest.xml
413
413
Lines 473-479 Link Here
473
    AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
473
    AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
474
  fi		       
474
  fi		       
475
fi
475
fi
476
AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
476
AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
477
477
478
if test "${have_nss}" != "yes"; then
478
if test "${have_nss}" != "yes"; then
479
  AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
479
  AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
Lines 514-523 Link Here
514
                    AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
514
                    AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
515
                    stap_LIBS="$stap_LIBS -lc -lrpmio"
515
                    stap_LIBS="$stap_LIBS -lc -lrpmio"
516
                    have_librpmio="yes"], [have_librpmio="no"])
516
                    have_librpmio="yes"], [have_librpmio="no"])
517
  if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
517
  if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
518
     AC_MSG_ERROR([cannot find librpm])
518
     AC_MSG_ERROR([cannot find librpm])
519
  fi
519
  fi
520
  if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
520
  if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
521
     AC_MSG_WARN([cannot find librpmio])
521
     AC_MSG_WARN([cannot find librpmio])
522
  fi
522
  fi
523
fi
523
fi
Lines 554-560 Link Here
554
	    [Define if you have the readline library (-lreadline).])
554
	    [Define if you have the readline library (-lreadline).])
555
fi
555
fi
556
AC_SUBST([READLINE_LIBS])
556
AC_SUBST([READLINE_LIBS])
557
AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
557
AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
558
558
559
dnl End of readline checks: restore LIBS
559
dnl End of readline checks: restore LIBS
560
LIBS=$LIBS_no_readline
560
LIBS=$LIBS_no_readline
Lines 710-716 Link Here
710
    AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
710
    AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
711
  fi		       
711
  fi		       
712
fi
712
fi
713
AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
713
AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
714
714
715
dnl Handle the option to build python2 probe support
715
dnl Handle the option to build python2 probe support
716
AC_ARG_WITH([python2-probes],
716
AC_ARG_WITH([python2-probes],
Lines 750-756 Link Here
750
AS_IF([test "x$with_python3_probes" != "xno"],
750
AS_IF([test "x$with_python3_probes" != "xno"],
751
  [dnl First, check to make sure we have the 'python3-config' script.
751
  [dnl First, check to make sure we have the 'python3-config' script.
752
   pathless_python3=$(basename "$PYTHON3")
752
   pathless_python3=$(basename "$PYTHON3")
753
   if test "x${pathless_python3}" == "x"; then
753
   if test "x${pathless_python3}" = "x"; then
754
	pathless_python3="python3"   
754
	pathless_python3="python3"   
755
   fi
755
   fi
756
   AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
756
   AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
Lines 785-792 Link Here
785
dnl Check for presence of json-c and ncurses for use in monitor mode
785
dnl Check for presence of json-c and ncurses for use in monitor mode
786
PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
786
PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
787
PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
787
PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
788
AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
788
AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes"])
789
if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
789
if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
790
  AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
790
  AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
791
fi
791
fi
792
792
Lines 823-829 Link Here
823
               [],
823
               [],
824
               [#include <linux/bpf.h>])
824
               [#include <linux/bpf.h>])
825
    ])
825
    ])
826
AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
826
AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
827
AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
827
AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
828
828
829
if test $build_elfutils = yes -a $enable_translator = yes; then
829
if test $build_elfutils = yes -a $enable_translator = yes; then
Lines 965-971 Link Here
965
   dnl If we have all of the libraries, the json-c and nss libraries,
965
   dnl If we have all of the libraries, the json-c and nss libraries,
966
   dnl and full C++11 support, we could build the httpd web
966
   dnl and full C++11 support, we could build the httpd web
967
   dnl compilation service.
967
   dnl compilation service.
968
   AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
968
   AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
969
969
970
AS_IF([test "x$have_http_support" = "xyes"],
970
AS_IF([test "x$have_http_support" = "xyes"],
971
  [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
971
  [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
Lines 1010-1016 Link Here
1010
initscript/99stap/install \
1010
initscript/99stap/install \
1011
initscript/99stap/check ])
1011
initscript/99stap/check ])
1012
AC_CONFIG_SUBDIRS(testsuite)
1012
AC_CONFIG_SUBDIRS(testsuite)
1013
if test $enable_translator == "yes"; then
1013
if test $enable_translator = "yes"; then
1014
	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
1014
	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
1015
fi
1015
fi
1016
AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
1016
AC_CONFIG_FILES([dtrace], [chmod +x dtrace])

Return to bug 719438