davfs2.m4 (davfs2-1.6.1) | : | davfs2.m4 (davfs2-1.7.0) | ||
---|---|---|---|---|
skipping to change at line 24 | skipping to change at line 24 | |||
# GNU General Public License for more details. | # GNU General Public License for more details. | |||
# | # | |||
# You should have received a copy of the GNU General Public License | # You should have received a copy of the GNU General Public License | |||
# along with davfs2; if not, write to the Free Software Foundation, | # along with davfs2; if not, write to the Free Software Foundation, | |||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ | |||
# Check for an external Neon library | # Check for an external Neon library | |||
# Looks for the binary 'neon-config'. If a directory is given with | # Looks for the binary 'neon-config'. If a directory is given with | |||
# --with-neon=, it looks in the bin-subdirectory of this, else it uses | # --with-neon=, it looks in the bin-subdirectory of this, else it uses | |||
# AC_PATH_PROG to find 'neon-config'. | # AC_PATH_PROG to find 'neon-config'. | |||
# If found, it sets variable NRON_CONFIG and calls NEON_USE_EXTERNAL. | # If found, it sets variable NEON_CONFIG and calls NEON_USE_EXTERNAL. | |||
# if not found, or if NEON_USE_EXTERNAL does not set neon_got_library | # if not found, or if NEON_USE_EXTERNAL does not set neon_got_library | |||
# to yes, configration is stopped with an error message. | # to yes, configration is stopped with an error message. | |||
AC_DEFUN([DAV_CHECK_NEON],[ | AC_DEFUN([DAV_CHECK_NEON],[ | |||
AC_ARG_WITH(neon, | AC_ARG_WITH(neon, | |||
[ --with-neon[[=DIR]] specify location of neon library], | [ --with-neon[[=DIR]] specify location of neon library], | |||
[case $withval in | [case $withval in | |||
yes|no) neon_ext_path= ;; | yes|no) neon_ext_path= ;; | |||
*) neon_ext_path=$withval ;; | *) neon_ext_path=$withval ;; | |||
skipping to change at line 79 | skipping to change at line 79 | |||
AC_DEFUN([DAV_DEFAULTS],[ | AC_DEFUN([DAV_DEFAULTS],[ | |||
AC_ARG_VAR([dav_user], | AC_ARG_VAR([dav_user], | |||
[if invoked by root, mount.davfs runs as this user [davfs2]]) | [if invoked by root, mount.davfs runs as this user [davfs2]]) | |||
if test -z "$dav_user"; then dav_user="davfs2"; fi | if test -z "$dav_user"; then dav_user="davfs2"; fi | |||
AC_ARG_VAR([dav_group], | AC_ARG_VAR([dav_group], | |||
[the group, the mount.davfs daemon belongs to [davfs2]]) | [the group, the mount.davfs daemon belongs to [davfs2]]) | |||
if test -z "$dav_group"; then dav_group="davfs2"; fi | if test -z "$dav_group"; then dav_group="davfs2"; fi | |||
AC_ARG_VAR([ssbindir], | ||||
[where mount will search for mount-helpers [/sbin]]) | ||||
if test -z "$ssbindir"; then ssbindir="/sbin"; fi | ||||
AC_ARG_VAR([dav_localstatedir], | AC_ARG_VAR([dav_localstatedir], | |||
[directory to store pid-files in [/var/run]]) | [directory to store pid-files in [/var/run]]) | |||
if test -z "$dav_localstatedir"; then dav_localstatedir="/var/run"; fi | if test -z "$dav_localstatedir"; then dav_localstatedir="/var/run"; fi | |||
AC_ARG_VAR([dav_syscachedir], | AC_ARG_VAR([dav_syscachedir], | |||
[cache directory [/var/cache]]) | [cache directory [/var/cache]]) | |||
if test -z "$dav_syscachedir"; then dav_syscachedir="/var/cache"; fi | if test -z "$dav_syscachedir"; then dav_syscachedir="/var/cache"; fi | |||
]) | ]) | |||
# Select the languages for documentation and messages | # Select the languages for documentation and messages | |||
skipping to change at line 143 | skipping to change at line 139 | |||
AC_SYS_LARGEFILE | AC_SYS_LARGEFILE | |||
fi | fi | |||
if test "$ac_cv_sys_file_offset_bits" = "64"; then | if test "$ac_cv_sys_file_offset_bits" = "64"; then | |||
dav_lfs=yes | dav_lfs=yes | |||
else | else | |||
dav_lfs=no | dav_lfs=no | |||
fi | fi | |||
]) | ]) | |||
# Disable character conversion. | ||||
AC_DEFUN([DAV_ICONV],[ | ||||
AC_ARG_ENABLE([iconv], | ||||
[ --disable-iconv disable character conversion], | ||||
[dav_iconv=$enableval], | ||||
[dav_iconv=yes]) | ||||
if test "$dav_iconv" = "yes"; then | ||||
AC_DEFINE([DAV_USE_ICONV], [1], | ||||
[Define to enable charcter conversion]) | ||||
fi | ||||
]) | ||||
# Output summary | # Output summary | |||
AC_DEFUN([DAV_MESSAGE],[ | AC_DEFUN([DAV_MESSAGE],[ | |||
if test "$USE_NLS" = "yes"; then | if test "$USE_NLS" = "yes"; then | |||
dav_nls=${gt_source} | dav_nls=${gt_source} | |||
else | else | |||
dav_nls=no | dav_nls=no | |||
fi | fi | |||
cat<<EOF | cat<<EOF | |||
Configuration for building davfs2 AC_PACKAGE_VERSION: | Configuration for building davfs2 AC_PACKAGE_VERSION: | |||
Install Prefix: ${prefix} | Install Prefix: ${prefix} | |||
Compiler: ${CC} | Compiler: ${CC} | |||
Large File Support: ${dav_lfs} | Large File Support: ${dav_lfs} | |||
Neon Library: ${neon_library_message} | Neon Library: ${neon_library_message} | |||
${ne_SSL_message} | ${ne_SSL_message} | |||
National Language Support: ${dav_nls} | Native Language Support: ${dav_nls} | |||
Host ${host_os} | ||||
EOF | EOF | |||
]) | ]) | |||
End of changes. 4 change blocks. | ||||
7 lines changed or deleted | 18 lines changed or added |