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

(-)a/Makefile.am (-3 lines)
Lines 79-87 Link Here
79
if HAVE_HASKELL
79
if HAVE_HASKELL
80
SUBDIRS += haskell
80
SUBDIRS += haskell
81
endif
81
endif
82
if HAVE_PHP
83
SUBDIRS += php
84
endif
85
if HAVE_ERLANG
82
if HAVE_ERLANG
86
SUBDIRS += erlang erlang/examples
83
SUBDIRS += erlang erlang/examples
87
endif
84
endif
(-)a/configure.ac (-10 / +35 lines)
Lines 380-385 Link Here
380
        DISTRO=UBUNTU
380
        DISTRO=UBUNTU
381
    fi
381
    fi
382
fi
382
fi
383
if test -f /etc/gentoo-release; then
384
    DISTRO=GENTOO
385
fi
386
387
383
if test -f /etc/arch-release; then
388
if test -f /etc/arch-release; then
384
    DISTRO=ARCHLINUX
389
    DISTRO=ARCHLINUX
385
fi
390
fi
Lines 392-397 Link Here
392
AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
397
AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
393
        AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
398
        AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
394
        ])
399
        ])
400
AS_IF([test "xRPCGEN" = "xno"], [AC_MSG_ERROR([rpcgen not installed])],[])
395
401
396
dnl Check for Augeas (optional).
402
dnl Check for Augeas (optional).
397
PKG_CHECK_MODULES([AUGEAS], [augeas],
403
PKG_CHECK_MODULES([AUGEAS], [augeas],
Lines 405-413 Link Here
405
         AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
411
         AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
406
         LIBS="$old_LIBS"
412
         LIBS="$old_LIBS"
407
        ],
413
        ],
408
        [AC_MSG_WARN([augeas not found, some core features will be disabled])])
414
 [AC_MSG_ERROR([augeas not found, some core features will be disabled])])
409
415
410
dnl Check for libselinux (optional).
416
dnl Check for libselinux (optional).
417
dnl TODO selinux triplet
418
411
AC_CHECK_HEADERS([selinux/selinux.h])
419
AC_CHECK_HEADERS([selinux/selinux.h])
412
AC_CHECK_LIB([selinux],[setexeccon],[
420
AC_CHECK_LIB([selinux],[setexeccon],[
413
        have_libselinux="$ac_cv_header_selinux_selinux_h"
421
        have_libselinux="$ac_cv_header_selinux_selinux_h"
Lines 433-439 Link Here
433
AS_IF([test "x$enable_probes" != "xno"],[
441
AS_IF([test "x$enable_probes" != "xno"],[
434
    dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
442
    dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
435
    AC_CHECK_HEADERS([sys/sdt.h])
443
    AC_CHECK_HEADERS([sys/sdt.h])
436
    dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
444
    AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
437
    AS_IF([test "x$ac_cv_header_sys_sdt_h" = "xyes"],[
445
    AS_IF([test "x$ac_cv_header_sys_sdt_h" = "xyes"],[
438
        AC_DEFINE([ENABLE_PROBES],[1],[enable systemtap/DTrace userspace probes])
446
        AC_DEFINE([ENABLE_PROBES],[1],[enable systemtap/DTrace userspace probes])
439
    ])
447
    ])
Lines 488-498 Link Here
488
496
489
dnl Check for optional xmllint.
497
dnl Check for optional xmllint.
490
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
498
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
499
AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[])
500
491
AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
501
AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
492
502
493
dnl po4a for translating man pages and POD files (optional).
503
dnl po4a for translating man pages and POD files (optional).
494
AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
504
AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
495
AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
505
AC_ARG_ENABLE([doc],
506
       AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]),
507
       [enable_doc=no],
508
       [enable_doc=yes])
509
AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[])  
510
AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"])
511
512
496
513
497
dnl Check for db_dump, db_load (optional).
514
dnl Check for db_dump, db_load (optional).
498
AC_CHECK_PROGS([DB_DUMP],
515
AC_CHECK_PROGS([DB_DUMP],
Lines 683-688 Link Here
683
        [])
700
        [])
684
701
685
dnl Readline.
702
dnl Readline.
703
dnl TODO - add ncurses LDFLGS separately
704
dnl build --without-redline in fact broken with -lncurses not inherited
705
686
AC_ARG_WITH([readline],
706
AC_ARG_WITH([readline],
687
    [AS_HELP_STRING([--with-readline],
707
    [AS_HELP_STRING([--with-readline],
688
        [support fancy command line editing @<:@default=check@:>@])],
708
        [support fancy command line editing @<:@default=check@:>@])],
Lines 1051-1061 Link Here
1051
    [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"])
1071
    [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"])
1052
1072
1053
dnl Check for Java.
1073
dnl Check for Java.
1054
AC_ARG_WITH(java_home,
1074
AC_ARG_ENABLE([java],
1055
    [AS_HELP_STRING([--with-java-home],
1075
       AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
1056
        [specify path to JDK directory @<:@default=check@:>@])],
1076
        [enable_java=no],
1057
    [],
1077
       [enable_java=yes])
1058
    [with_java_home=check])
1078
1079
AS_IF([test "x$enable_java" = "xyes"],
1080
       [
1059
1081
1060
if test "x$with_java_home" != "xno"; then
1082
if test "x$with_java_home" != "xno"; then
1061
    if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
1083
    if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
Lines 1201-1207 Link Here
1201
AC_SUBST(JNI_INSTALL_DIR)
1223
AC_SUBST(JNI_INSTALL_DIR)
1202
AC_SUBST(JNI_VERSION_INFO)
1224
AC_SUBST(JNI_VERSION_INFO)
1203
1225
1204
AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
1226
1227
])
1228
AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
1205
1229
1206
dnl Check for Haskell (GHC).
1230
dnl Check for Haskell (GHC).
1207
GHC=no
1231
GHC=no
Lines 1338-1345 Link Here
1338
1362
1339
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
1363
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
1340
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
1364
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
1341
LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
1365
dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
1342
AC_SUBST([LIBTOOL])
1366
AC_SUBST([LIBTOOL])
1367
LT_INIT
1343
1368
1344
dnl Produce output files.
1369
dnl Produce output files.
1345
AC_CONFIG_HEADERS([config.h])
1370
AC_CONFIG_HEADERS([config.h])
(-)a/inspector/Makefile.am (-1 / +1 lines)
Lines 40-46 Link Here
40
40
41
CLEANFILES = stamp-virt-inspector.pod
41
CLEANFILES = stamp-virt-inspector.pod
42
42
43
docdir = @docdir@
43
docdir = @docdir@/examples
44
dist_doc_DATA = \
44
dist_doc_DATA = \
45
	virt-inspector.rng \
45
	virt-inspector.rng \
46
	$(EXAMPLE_XML)
46
	$(EXAMPLE_XML)
(-)a/Makefile.am (-1 / +1 lines)
Lines 161-167 Link Here
161
libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
161
libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
162
162
163
libguestfs_la_CFLAGS = \
163
libguestfs_la_CFLAGS = \
164
  -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
164
  -DGUESTFS_DEFAULT_PATH='"$(datadir)/guestfs/appliance"' \
165
  -DGUESTFS_WARN_DEPRECATED=1 \
165
  -DGUESTFS_WARN_DEPRECATED=1 \
166
  $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
166
  $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
167
  $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
167
  $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \

Return to bug 427842