]> git.proxmox.com Git - mirror_smartmontools-debian.git/blobdiff - configure.ac
Fix upstream branch
[mirror_smartmontools-debian.git] / configure.ac
index 58e56175f39d61740b69a2b1861a3984f62d2a99..f0d47338198bb05a0c40b02c1604918c2a64e7e9 100644 (file)
@@ -1,24 +1,14 @@
 #
-<<<<<<< HEAD
 # $Id: configure.ac 4319 2016-05-07 12:14:20Z chrfranke $
-=======
-# $Id: configure.ac 4109 2015-06-04 16:30:15Z chrfranke $
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.60])
 AC_INIT(smartmontools, 6.6, smartmontools-support@lists.sourceforge.net)
 AM_INIT_AUTOMAKE([1.10 foreign])
 
-<<<<<<< HEAD
 smartmontools_cvs_tag=`echo '$Id: configure.ac 4319 2016-05-07 12:14:20Z chrfranke $'`
 smartmontools_release_date=2016-05-07
 smartmontools_release_time="11:17:46 UTC"
-=======
-smartmontools_cvs_tag=`echo '$Id: configure.ac 4109 2015-06-04 16:30:15Z chrfranke $'`
-smartmontools_release_date=2015-06-04
-smartmontools_release_time="16:29:41 UTC"
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args",            [smartmontools Configure Arguments])
 AC_DEFINE_UNQUOTED(SMARTMONTOOLS_RELEASE_DATE,   "$smartmontools_release_date",   [smartmontools Release Date])
@@ -242,26 +232,11 @@ case "${host}" in
 esac
 AC_SUBST(initdfile)
 
-<<<<<<< HEAD
-=======
-autoconf_25x=${docdir:-yes}
-AC_ARG_WITH(docdir,
-  [AS_HELP_STRING([--with-docdir=DIR], [Deprecated (use --docdir=DIR instead)])],
-  [docdir="$withval"],
-  [ if test -z "$docdir"; then
-      # autoconf 2.5x without '--docdir' support
-      docdir='${datadir}/doc/${PACKAGE}'
-    fi
-  ])
-AC_SUBST(docdir)
-
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 AC_ARG_WITH(exampledir,
   [AS_HELP_STRING([--with-exampledir=DIR], [Location of example scripts [DOCDIR/examplescripts]])],
   [exampledir="$withval"], [exampledir='${docdir}/examplescripts'])
 AC_SUBST(exampledir)
 
-<<<<<<< HEAD
 drivedbdir='${datadir}/${PACKAGE}'
 AC_ARG_WITH(drivedbdir,
   [AS_HELP_STRING([--with-drivedbdir@<:@=DIR|yes|no@:>@], [Location of drive database file [DATADIR/smartmontools]])],
@@ -275,20 +250,6 @@ AC_ARG_WITH(update-smart_drivedb,
 test -n "$drivedbdir" || with_update_smart_drivedb=no
 AC_SUBST(with_update_smart_drivedb)
 AM_CONDITIONAL(ENABLE_UPDATE_SMART_DRIVEDB, [test "$with_update_smart_drivedb" = "yes"])
-=======
-used_deprecated_option=no
-AC_ARG_ENABLE(drivedb,
-  [AS_HELP_STRING([--disable-drivedb], [Deprecated (use --without-drivedbdir instead)])],
-  [used_deprecated_option=yes], [enable_drivedb=yes])
-
-drivedbdir=
-AC_ARG_WITH(drivedbdir,
-  [AS_HELP_STRING([--with-drivedbdir=@<:@DIR|no@:>@], [Location of drive database file [DATADIR/smartmontools]])],
-  [test "$withval" != "no" && drivedbdir="$withval"],
-  [test "$enable_drivedb" != "no" && drivedbdir='${datadir}/${PACKAGE}'])
-AC_SUBST(drivedbdir)
-AM_CONDITIONAL(ENABLE_DRIVEDB, [test -n "$drivedbdir"])
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 AC_ARG_WITH(smartdscriptdir,
   [AS_HELP_STRING([--with-smartdscriptdir=DIR], [Location of smartd_warning.sh script [SYSCONFDIR]])],
@@ -302,30 +263,16 @@ AC_ARG_WITH(smartdplugindir,
   [smartdplugindir='${smartdscriptdir}/smartd_warning.d'])
 AC_SUBST(smartdplugindir)
 
-<<<<<<< HEAD
 savestates=
 AC_ARG_WITH(savestates,
   [AS_HELP_STRING([--with-savestates@<:@=PREFIX|yes|no@:>@],
     [Enable default smartd state files [no] (yes=LOCALSTATEDIR/lib/smartmontools/smartd.)])],
   [case "$withval" in yes) savestates='${localstatedir}/lib/${PACKAGE}/smartd.' ;;
                       no) ;; *) savestates="$withval" ;; esac])
-=======
-AC_ARG_ENABLE(savestates,
-  [AS_HELP_STRING([--enable-savestates], [Deprecated (use --with-savestates@<:@=yes@:>@ instead)])],
-  [used_deprecated_option=yes], [enable_savestates=no])
-
-savestates='${localstatedir}/lib/${PACKAGE}/smartd.'
-AC_ARG_WITH(savestates,
-  [AS_HELP_STRING([--with-savestates@<:@=PREFIX|yes|no@:>@],
-    [Enable default smartd state files [no] (yes=LOCALSTATEDIR/lib/smartmontools/smartd.)])],
-  [case "$withval" in yes) ;; no) savestates= ;; *) savestates="$withval" ;; esac],
-  [test "$enable_savestates" != "yes" && savestates=])
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 savestatesdir="${savestates%/*}"
 AC_SUBST(savestates)
 AC_SUBST(savestatesdir)
 AM_CONDITIONAL(ENABLE_SAVESTATES, [test -n "$savestates"])
-<<<<<<< HEAD
 
 attributelog=
 AC_ARG_WITH(attributelog,
@@ -333,19 +280,6 @@ AC_ARG_WITH(attributelog,
     [Enable default smartd attribute log files [no] (yes=LOCALSTATEDIR/lib/smartmontools/attrlog.)])],
   [case "$withval" in yes) attributelog='${localstatedir}/lib/${PACKAGE}/attrlog.' ;;
                       no) ;; *) attributelog="$withval" ;; esac])
-=======
-
-AC_ARG_ENABLE(attributelog,
-  [AS_HELP_STRING([--enable-attributelog], [Deprecated (use --with-attributelog@<:@=yes@:>@ instead)])],
-  [used_deprecated_option=yes], [enable_attributelog=no])
-
-attributelog='${localstatedir}/lib/${PACKAGE}/attrlog.'
-AC_ARG_WITH(attributelog,
-  [AS_HELP_STRING([--with-attributelog@<:@=PREFIX|yes|no@:>@],
-    [Enable default smartd attribute log files [no] (yes=LOCALSTATEDIR/lib/smartmontools/attrlog.)])],
-  [case "$withval" in yes) ;; no) attributelog= ;; *) attributelog="$withval" ;; esac],
-  [test "$enable_attributelog" != "yes" && attributelog=])
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 attributelogdir="${attributelog%/*}"
 AC_SUBST(attributelog)
 AC_SUBST(attributelogdir)
@@ -458,7 +392,6 @@ if test "$libc_have_working_snprintf" = "yes"; then
   AC_DEFINE(HAVE_WORKING_SNPRINTF, 1, [Define to 1 if the `snprintf' function is sane.]) dnl `vim syntax
 fi
 
-<<<<<<< HEAD
 os_win32_manifest=
 case "$host" in
   *-*-mingw*)
@@ -492,13 +425,6 @@ AC_ARG_ENABLE(attributelog,
 if test -n "${enable_drivedb+set}${enable_savestates+set}${enable_attributelog+set}"; then
   AC_MSG_ERROR([Options --disable-drivedb, --enable-savestates, --enable-attributelog are no longer supported.
 Use --without-drivedbdir, --with-savestates, --with-attributelog instead.])
-=======
-if test "$prefix" = "NONE"; then
-    # Fix mandir default set by autoconf 2.5x
-    if test "$mandir" = '${prefix}/man'; then
-       AC_SUBST([mandir], ['${prefix}/share/man'])
-    fi
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 fi
 
 
@@ -798,24 +724,3 @@ Use option '--with-solaris-sparc-ata' to enable legacy ATA support.
 Use option '--without-solaris-sparc-ata' to suppress this warning.])
     ;;
 esac
-<<<<<<< HEAD
-=======
-echo "-----------------------------------------------------------------------------" >&AS_MESSAGE_FD
-
-if test "$autoconf_25x" = "yes"; then
- echo "WARNING:" >&AS_MESSAGE_FD
- echo "Support for old autoconf 2.5x versions will be removed in a future" >&AS_MESSAGE_FD
- echo "release of smartmontools." >&AS_MESSAGE_FD
-elif test "${with_docdir+set}" = "set"; then
- echo "WARNING:" >&AS_MESSAGE_FD
- echo "Option --with-docdir is deprecated and will be removed in a future" >&AS_MESSAGE_FD
- echo "release of smartmontools.  Use --docdir instead." >&AS_MESSAGE_FD
-fi
-
-if test "$used_deprecated_option" = "yes"; then
-  echo "WARNING:" >&AS_MESSAGE_FD
-  echo "Options --disable-drivedb, --enable-savestates, --enable-attributelog are" >&AS_MESSAGE_FD
-  echo "deprecated and will be removed in a future release of smartmontools." >&AS_MESSAGE_FD
-  echo "Use --without-drivedb, --with-savestates, --with-attributelog instead." >&AS_MESSAGE_FD
-fi
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74