diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index a56cf00f883e357ffa920c4e1d8e0a9394fafdd0..28b6935c3caccdcdc8a8d9995805e752d04175be 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -1,5 +1,11 @@ $Id$ +2022-05-01 Christian Franke <franke@computer.org> + + configure.ac: Add URL to AC_INIT, remove PACKAGE_HOMEPAGE. + Require autoconf >= 2.64. + Replace PACKAGE_HOMEPAGE with PACKAGE_URL in all files. + 2022-04-30 Christian Franke <franke@computer.org> INSTALL: Update info about MSVC builds. diff --git a/smartmontools/atacmds.cpp b/smartmontools/atacmds.cpp index 57b7fa37f8d604677427c4a36f1a7ff594eaa32c..7a07b6d1c990ea694e156a46fa97dd58dd0c7990 100644 --- a/smartmontools/atacmds.cpp +++ b/smartmontools/atacmds.cpp @@ -618,7 +618,7 @@ int smartcommandhandler(ata_device * device, smart_command_set command, int sele else { // We haven't gotten output that makes sense; print out some debugging info pout("SMART Status command failed\n"); - pout("Please get assistance from %s\n", PACKAGE_HOMEPAGE); + pout("Please get assistance from %s\n", PACKAGE_URL); pout("Register values returned from SMART Status command are:\n"); print_regs(" ", out.out_regs); device->set_err(ENOSYS, "Invalid ATA output register values"); diff --git a/smartmontools/configure.ac b/smartmontools/configure.ac index d70c30d3a557c170403117a9b7ea53119b699af0..c5609b1ad0ae549480768a21b1f36cc540ee56d3 100644 --- a/smartmontools/configure.ac +++ b/smartmontools/configure.ac @@ -2,8 +2,8 @@ # $Id$ # dnl Process this file with autoconf to produce a configure script. -AC_PREREQ([2.60]) -AC_INIT([smartmontools],[7.4],[smartmontools-support@listi.jpberlin.de]) +AC_PREREQ([2.64]) +AC_INIT([smartmontools],[7.4],[smartmontools-support@listi.jpberlin.de],[],[https://www.smartmontools.org/]) AM_INIT_AUTOMAKE([1.10 foreign]) # Version of drive database branch @@ -25,7 +25,6 @@ fi smartmontools_cvs_tag=`echo '$Id$'` AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args", [smartmontools Configure Arguments]) AC_DEFINE_UNQUOTED(CONFIG_H_CVSID, "$smartmontools_cvs_tag", [smartmontools CVS Tag]) -AC_DEFINE_UNQUOTED(PACKAGE_HOMEPAGE, "https://www.smartmontools.org/", [smartmontools Home Page]) AC_CONFIG_SRCDIR([smartctl.cpp]) AC_CONFIG_HEADERS([config.h]) diff --git a/smartmontools/knowndrives.cpp b/smartmontools/knowndrives.cpp index c29610551ee2cd678dded0499a1132e24aef5377..0f114a9769bd17f3de0a52e1b8574bd7e8cb5f24 100644 --- a/smartmontools/knowndrives.cpp +++ b/smartmontools/knowndrives.cpp @@ -504,7 +504,7 @@ int showallpresets() knowndrives.size(), knowndrives.custom_size()); pout("For information about adding a drive to the database see the FAQ on the\n"); - pout("smartmontools home page: " PACKAGE_HOMEPAGE "\n"); + pout("smartmontools home page: " PACKAGE_URL "\n"); if (errcnt > 0) pout("\nFound %d syntax error(s) in database.\n" diff --git a/smartmontools/os_freebsd.cpp b/smartmontools/os_freebsd.cpp index 190cfc66f4529e6cb4a4cefecacb5e1ff195e623..bc7ecf8a33295a974daa352bc397940d0fcaab43 100644 --- a/smartmontools/os_freebsd.cpp +++ b/smartmontools/os_freebsd.cpp @@ -95,7 +95,7 @@ void printwarning(int msgNo, const char* extra) { static const char* message[]={ "The SMART RETURN STATUS return value (smartmontools -H option/Directive)\n can not be retrieved with this version of ATAng, please do not rely on this value\nYou should update to at least 5.2\n", - "Error SMART Status command failed\nPlease get assistance from \n" PACKAGE_HOMEPAGE "\nRegister values returned from SMART Status command are:\n", + "Error SMART Status command failed\nPlease get assistance from \n" PACKAGE_URL "\nRegister values returned from SMART Status command are:\n", "You must specify a DISK # for 3ware drives with -d 3ware,<n> where <n> begins with 1 for first disk drive\n", diff --git a/smartmontools/os_linux.cpp b/smartmontools/os_linux.cpp index 4797a5de6086609eeee912bae9994744f06265d2..e8b9438cca35624cc5a545a7ca8a7afb04312fcc 100644 --- a/smartmontools/os_linux.cpp +++ b/smartmontools/os_linux.cpp @@ -412,7 +412,7 @@ int linux_ata_device::ata_command_interface(smart_command_set command, int selec // We haven't gotten output that makes sense; print out some debugging info syserror("Error SMART Status command failed"); - pout("Please get assistance from " PACKAGE_HOMEPAGE "\n"); + pout("Please get assistance from " PACKAGE_URL "\n"); pout("Register values returned from SMART Status command are:\n"); pout("ST =0x%02x\n",(int)buff[0]); pout("ERR=0x%02x\n",(int)buff[1]); @@ -2369,7 +2369,7 @@ int linux_highpoint_device::ata_command_interface(smart_command_set command, int return 1; syserror("Error SMART Status command failed"); - pout("Please get assistance from " PACKAGE_HOMEPAGE "\n"); + pout("Please get assistance from " PACKAGE_URL "\n"); pout("Register values returned from SMART Status command are:\n"); pout("CMD=0x%02x\n",(int)buff[0]); pout("FR =0x%02x\n",(int)buff[1]); @@ -2416,7 +2416,7 @@ void printwarning(smart_command_set command){ const char* message= "can not be passed through the 3ware 3w-xxxx driver. This can be fixed by\n" "applying a simple 3w-xxxx driver patch that can be found here:\n" - PACKAGE_HOMEPAGE "\n" + PACKAGE_URL "\n" "Alternatively, upgrade your 3w-xxxx driver to version 1.02.00.037 or greater.\n\n"; if (command==AUTO_OFFLINE && !printed[0]) { diff --git a/smartmontools/os_os2.cpp b/smartmontools/os_os2.cpp index 5d1b5145a6cf4f21a1b6129b4ca9091abb9dae67..87b9305bcf93f45c97c8869268741f5f1c29f69f 100644 --- a/smartmontools/os_os2.cpp +++ b/smartmontools/os_os2.cpp @@ -508,7 +508,7 @@ int ata_command_interface(int device, smart_command_set command, int select, cha // We haven't gotten output that makes sense; print out some debugging info syserror("Error SMART Status command failed"); - pout("Please get assistance from " PACKAGE_HOMEPAGE "\n"); + pout("Please get assistance from " PACKAGE_URL "\n"); return -1; } diff --git a/smartmontools/scsiata.cpp b/smartmontools/scsiata.cpp index 24af7f1214def779431f54c6de3a8e8ba2b1de2a..d208deaa05276577cdc856f477a5b3eed4903a7f 100644 --- a/smartmontools/scsiata.cpp +++ b/smartmontools/scsiata.cpp @@ -853,7 +853,7 @@ int usbcypress_device::ata_command_interface(smart_command_set command, int sele syserror("Error SMART Status command failed"); pout("This may be due to a race in usbcypress\n"); pout("Retry without other disc access\n"); - pout("Please get assistance from " PACKAGE_HOMEPAGE "\n"); + pout("Please get assistance from " PACKAGE_URL "\n"); pout("Values from ATA Return Descriptor are:\n"); dStrHex((const uint8_t *)ardp, ard_len, 1); return -1;