]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
1  2 
configure.ac
macros/netatalk.m4
macros/summary.m4

diff --combined configure.ac
index d79766086256004481f73d33fe8e2670754fb9d7,c5b18c173bf8748a7880d57cc9dfee9dbc0e23da..421c9fef754f58fb0dcbd0659413a1566b7ef68a
@@@ -25,8 -25,6 +25,8 @@@ AC_PROG_P
  AM_PROG_CC_C_O
  AC_C_BIGENDIAN
  AC_C_INLINE
 +AC_PROG_LEX
 +AC_PROG_YACC
  
  dnl Check if we can use attribute unused (gcc only) from ethereal
  AC_MSG_CHECKING(to see if we can add '__attribute__((unused))' to CFLAGS)
@@@ -182,9 -180,6 +182,9 @@@ AC_NETATALK_SENDFIL
  dnl Check whether bundled libevent shall not be used
  AC_NETATALK_LIBEVENT
  
 +dnl Check for Tracker
 +AC_NETATALK_SPOTLIGHT
 +
  dnl libatalk API checks
  AC_DEVELOPER
  
@@@ -200,6 -195,9 +200,9 @@@ AC_NETATALK_FH
  dnl netatalk lockfile path, must come after AC_NETATALK_FHS
  AC_NETATALK_LOCKFILE
  
+ dnl Check for Docbook and build documentation if found
+ AX_CHECK_DOCBOOK
  CFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include $CFLAGS"
  UAMS_PATH="${uams_path}"
  
@@@ -251,11 -249,18 +254,19 @@@ AC_OUTPUT([Makefil
        distrib/initscripts/Makefile
        distrib/m4/Makefile
        doc/Makefile
+     doc/html.xsl
+     doc/man.xsl
+     doc/manual/Makefile
+     doc/manual/manual.xml
+     doc/manpages/Makefile
+     doc/manpages/man1/Makefile
+     doc/manpages/man5/Makefile
+     doc/manpages/man8/Makefile
        etc/Makefile
        etc/afpd/Makefile
        etc/cnid_dbd/Makefile
        etc/netatalk/Makefile
 +      etc/spotlight/Makefile
        etc/uams/Makefile
        include/Makefile
        include/atalk/Makefile
        libatalk/compat/Makefile
        libatalk/dsi/Makefile
        libatalk/iniparser/Makefile
 +      libatalk/talloc/Makefile
        libatalk/tdb/Makefile
        libatalk/unicode/Makefile
        libatalk/unicode/charsets/Makefile
        macros/Makefile
        man/Makefile
        man/man1/Makefile
+     man/man1/ad.1
+     man/man1/afpldaptest.1
+     man/man1/afppasswd.1
+     man/man1/afpstats.1
+     man/man1/apple_dump.1
+     man/man1/asip-status.pl.1
+     man/man1/dbd.1
+     man/man1/macusers.1
+     man/man1/netatalk-config.1
+     man/man1/uniconv.1
        man/man5/Makefile
+     man/man5/afp.conf.5
+     man/man5/afp_signature.conf.5
+     man/man5/afp_voluuid.conf.5
+     man/man5/extmap.conf.5
        man/man8/Makefile
+     man/man8/afpd.8
+     man/man8/cnid_dbd.8
+     man/man8/cnid_metad.8
+     man/man8/netatalk.8
        test/Makefile
        test/afpd/Makefile
        ],
diff --combined macros/netatalk.m4
index a0d4a82d4ae6da700f4f79a11401ae815d358fd5,886daa73d11c916b141edafa70ad5fba054275b7..dc868ddc9878ab04611ae8aa713ed6b2bb6dc864
@@@ -1,5 -1,47 +1,47 @@@
  dnl Kitchen sink for configuration macros
  
+ dnl Check for docbook
+ AC_DEFUN(AX_CHECK_DOCBOOK, [
+   # It's just rude to go over the net to build
+   XSLTPROC_FLAGS=--nonet
+   DOCBOOK_ROOT=
+   XSLTPROC_WORKS=no
+   AC_ARG_WITH(docbook,
+     AS_HELP_STRING(
+       [--with-docbook],
+       [Path to Docbook XSL directory]
+     ),
+     [DOCBOOK_ROOT=$withval]
+   )
+   if test -n "$DOCBOOK_ROOT" ; then
+     AC_CHECK_PROG(XSLTPROC,xsltproc,xsltproc,)
+     if test -n "$XSLTPROC"; then
+       AC_MSG_CHECKING([whether xsltproc works])
+       DB_FILE="$DOCBOOK_ROOT/html/docbook.xsl"
+       $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2&>&1 << END
+ <?xml version="1.0" encoding='ISO-8859-1'?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+ <book id="test">
+ </book>
+ END
+       if test "$?" = 0; then
+         XSLTPROC_WORKS=yes
+       fi
+       AC_MSG_RESULT($XSLTPROC_WORKS)
+     fi
+   fi
+   AC_MSG_CHECKING([whether to build Docbook documentation])
+   AC_MSG_RESULT($XSLTPROC_WORKS)
+   AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC_WORKS" = x"yes")
+   AC_SUBST(XSLTPROC_FLAGS)
+   AC_SUBST(DOCBOOK_ROOT)
+   AC_SUBST(XSLTPROC)
+ ])
  dnl Check for dtrace
  AC_DEFUN([AC_NETATALK_DTRACE], [
    AC_ARG_WITH(dtrace,
  
  dnl Check for dbus-glib, for AFP stats
  AC_DEFUN([AC_NETATALK_DBUS_GLIB], [
 -    atalk_cv_with_dbus=no
 +  atalk_cv_with_dbus=no
 +
 +  AC_ARG_WITH(afpstats,
 +    AS_HELP_STRING(
 +      [--with-afpstats],
 +      [Enable AFP statistics via dbus (default: enabled if dbus found)]
 +    ),,[withval=auto]
 +  )
 +
 +  if test x"$withval" != x"no" ; then
      PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1, have_dbus=yes, have_dbus=no)
      PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1, have_dbus_glib=yes, have_dbus_glib=no)
      PKG_CHECK_MODULES(DBUS_GTHREAD, gthread-2.0, have_dbus_gthread=yes, have_dbus_gthread=no)
 -    AC_SUBST(DBUS_CFLAGS)
 -    AC_SUBST(DBUS_LIBS)
 -    AC_SUBST(DBUS_GLIB_CFLAGS)
 -    AC_SUBST(DBUS_GLIB_LIBS)
 -    AC_SUBST(DBUS_GTHREAD_CFLAGS)
 -    AC_SUBST(DBUS_GTHREAD_LIBS)
      if test x$have_dbus_glib = xyes -a x$have_dbus = xyes -a x$have_dbus_gthread = xyes ; then
          saved_CFLAGS=$CFLAGS
          saved_LIBS=$LIBS
          CFLAGS="$saved_CFLAGS"
          LIBS="$saved_LIBS"
      fi
 -    AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes)
 +  fi
  
 -    AC_ARG_WITH(
 -        dbus-sysconf-dir,
 -        [AS_HELP_STRING([--with-dbus-sysconf-dir=PATH],[Path to dbus system bus security configuration directory (default: ${sysconfdir}/dbus-1/system.d/)])],
 -        ac_cv_dbus_sysdir=$withval,
 -        ac_cv_dbus_sysdir='${sysconfdir}/dbus-1/system.d'
 -    )
 +  if test x"$withval" = x"yes" -a x"$atalk_cv_with_dbus" = x"no"; then
 +    AC_MSG_ERROR([afpstats requested but dbus-glib not found])
 +  fi
  
 -    if test x$atalk_cv_with_dbus = xyes ; then
 -        AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if support for dbus-glib was found])
 -        DBUS_SYS_DIR="$ac_cv_dbus_sysdir"
 -        AC_SUBST(DBUS_SYS_DIR)
 -    fi
 +  AC_ARG_WITH(
 +      dbus-sysconf-dir,
 +      [AS_HELP_STRING([--with-dbus-sysconf-dir=PATH],[Path to dbus system bus security configuration directory (default: ${sysconfdir}/dbus-1/system.d/)])],
 +      ac_cv_dbus_sysdir=$withval,
 +      ac_cv_dbus_sysdir='${sysconfdir}/dbus-1/system.d'
 +  )
 +  DBUS_SYS_DIR=""
 +  if test x$atalk_cv_with_dbus = xyes ; then
 +      AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if support for dbus-glib was found])
 +      DBUS_SYS_DIR="$ac_cv_dbus_sysdir"
 +  fi
 +
 +  AC_SUBST(DBUS_SYS_DIR)
 +  AC_SUBST(DBUS_CFLAGS)
 +  AC_SUBST(DBUS_LIBS)
 +  AC_SUBST(DBUS_GLIB_CFLAGS)
 +  AC_SUBST(DBUS_GLIB_LIBS)
 +  AC_SUBST(DBUS_GTHREAD_CFLAGS)
 +  AC_SUBST(DBUS_GTHREAD_LIBS)
 +  AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes)
  ])
  
  dnl Whether to enable developer build
@@@ -98,72 -125,6 +140,72 @@@ AC_DEFUN([AC_DEVELOPER], 
      AM_CONDITIONAL(DEVELOPER, test x"$enable_dev" = x"yes")
  ])
  
 +dnl Tracker, for Spotlight
 +AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
 +    ac_cv_have_tracker=no
 +    dnl Tracker SPARQL
 +    ac_cv_tracker_pkg_default=tracker-sparql-0.12
 +    AC_ARG_WITH([tracker-pkg-config],
 +      [AS_HELP_STRING([--with-tracker-pkg-config],[name of the Tracker SPARQL pkg in pkg-config])],
 +      [ac_cv_tracker_pkg=$withval],
 +      [ac_cv_tracker_pkg=$ac_cv_tracker_pkg_default])
 +
 +    PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker_sparql=yes], [ac_cv_have_tracker_sparql=no])
 +
 +    if test x"$ac_cv_have_tracker_sparql" = x"no" ; then
 +        if test x"$need_tracker" = x"yes" ; then
 +            AC_MSG_ERROR([$ac_cv_tracker_pkg not found])
 +        fi
 +    else
 +        AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
 +        AC_DEFINE(HAVE_TRACKER_SPARQL, 1, [Define if Tracker SPARQL is available])
 +        ac_cv_tracker_prefix=`pkg-config --variable=prefix $ac_cv_tracker_pkg`
 +        AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker])
 +        AC_DEFINE([DBUS_DAEMON_PATH], ["/bin/dbus-daemon"], [Path to dbus-daemon])
 +      fi
 +
 +    ac_cv_tracker_miner_pkg_default=tracker-miner-0.12
 +    AC_ARG_WITH([tracker-miner-pkg-config],
 +      [AS_HELP_STRING([--with-tracker-miner-pkg-config],[name of the Tracker miner pkg in pkg-config])],
 +      [ac_cv_tracker_miner_pkg=$withval],
 +      [ac_cv_tracker_miner_pkg=$ac_cv_tracker_miner_pkg_default])
 +
 +    PKG_CHECK_MODULES([TRACKER_MINER], [$ac_cv_tracker_miner_pkg >= 0.12], [ac_cv_have_tracker_miner=yes], [ac_cv_have_tracker_miner=no])
 +
 +    if test x"$ac_cv_have_tracker_miner" = x"yes" ; then
 +        AC_DEFINE(HAVE_TRACKER_MINER, 1, [Define if Tracker miner library is available])
 +        AC_SUBST(TRACKER_MINER_CFLAGS)
 +        AC_SUBST(TRACKER_MINER_LIBS)
 +      fi
 +
 +    dnl Test for Tracker 0.6 on Solaris and derived platforms, and FreeBSD
 +    if test x"$this_os" = x"solaris" -o x"$this_os" = x"freebsd" ; then
 +        PKG_CHECK_MODULES([TRACKER], [tracker >= 0.6], [ac_cv_have_tracker_rdf=yes], [ac_cv_have_tracker_rdf=no])
 +        if test x"$ac_cv_have_tracker_rdf" = x"yes" ; then
 +            AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
 +            AC_DEFINE(HAVE_TRACKER_RDF, 1, [Define if Tracker 0.6 with support for RDF queries is available])
 +            case "$this_os" in
 +            *solaris*)
 +                AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/lib/dbus-daemon"], [Path to dbus-daemon])
 +                AC_DEFINE([TRACKERD_PATH], ["/bin/trackerd"], [Path to trackerd])
 +                ;;
 +            *freebsd*)
 +                AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/local/bin/dbus-daemon"], [Path to dbus-daemon])
 +                AC_DEFINE([TRACKERD_PATH], ["/usr/local/libexec/trackerd"], [Path to trackerd])
 +                ;;
 +            esac
 +          fi
 +    fi
 +
 +    if test x"$ac_cv_have_tracker_sparql" = x"yes" -o x"$ac_cv_have_tracker_rdf" = x"yes" ; then
 +       ac_cv_have_tracker=yes
 +    fi
 +    AC_SUBST(TRACKER_CFLAGS)
 +    AC_SUBST(TRACKER_LIBS)
 +    AM_CONDITIONAL(HAVE_TRACKER_SPARQL, [test x"$ac_cv_have_tracker_sparql" = x"yes"])
 +    AM_CONDITIONAL(HAVE_TRACKER_RDF, [test x"$ac_cv_have_tracker_rdf" = x"yes"])
 +])
 +
  dnl Whether to disable bundled libevent
  AC_DEFUN([AC_NETATALK_LIBEVENT], [
      AC_MSG_CHECKING([whether to use bundled libevent])
diff --combined macros/summary.m4
index 80ce5afd76ded0ee30b7acb96f79ce37151641b4,ba8cde05a352b88523144b8a2d0f8fca5ef279da..520e1e0f0af83cacda87715d3117955d42bbddf1
@@@ -12,7 -12,6 +12,7 @@@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], 
        AC_MSG_RESULT([    AFP:])
        AC_MSG_RESULT([         Extended Attributes: $neta_cv_eas])
        AC_MSG_RESULT([         ACL support: $with_acl_support])
 +      AC_MSG_RESULT([         Spotlight: $ac_cv_have_tracker])
        AC_MSG_RESULT([    CNID:])
        AC_MSG_RESULT([         backends: $compiled_backends])
        AC_MSG_RESULT([    UAMS:])
@@@ -54,7 -53,7 +54,7 @@@ dnl   AC_MSG_RESULT([         Samba share
        AC_MSG_RESULT([         ACL support:             $with_acl_support])
        AC_MSG_RESULT([         Kerberos support:        $with_kerberos])
        AC_MSG_RESULT([         LDAP support:            $netatalk_cv_ldap])
 -      AC_MSG_RESULT([         dbus support:            $atalk_cv_with_dbus])
 +      AC_MSG_RESULT([         AFP stats via dbus:      $atalk_cv_with_dbus])
        AC_MSG_RESULT([         dtrace probes:           $WDTRACE])
        AC_MSG_RESULT([    Paths:])
        AC_MSG_RESULT([         Netatalk lockfile:       $ac_cv_netatalk_lock])
@@@ -75,6 -74,8 +75,8 @@@
                AC_MSG_WARN([ You can also re-run configure and specify --without-pam to disable PAM support.])
           fi
        fi
+       AC_MSG_RESULT([    Documentation:])
+       AC_MSG_RESULT([         Docbook:                 $XSLTPROC_WORKS])
  ])