On Sep 05, 2000, m...@mansr.com wrote:
> Claude Warren <cla...@xenei.com> writes:
>
> > I see that I can set DISTRO with the "--with-distro " option on configure.
> > But I don't see any way to set PACKAGE_EXTRA. Is there a simple way to do
> > this?
>
> There doesn't seem to be any better way than setting it via CFLAGS.
> It is also not clear why it was ever added in the first place.
Apparently, this recognizes an extra string part
within the version string, such as 15.0.0-beta.
I believe it can be safely removed.
Jan
diff --git a/src/libsox.c b/src/libsox.c
index 8e9ebad6..c1d2ad48 100644
--- a/src/libsox.c
+++ b/src/libsox.c
@@ -59,12 +59,6 @@ sox_version_info_t const * sox_version_info(void)
SOX_LIB_VERSION_CODE,
/* version */
NULL,
- /* sox_version_extra */
-#ifdef PACKAGE_EXTRA
- PACKAGE_EXTRA,
-#else
- NULL,
-#endif
/* sox_time */
__DATE__ " " __TIME__,
/* sox_distro */
diff --git a/src/sox.c b/src/sox.c
index 9e59a60d..1afd9c90 100644
--- a/src/sox.c
+++ b/src/sox.c
@@ -1799,11 +1799,7 @@ static void display_SoX_version(FILE * file)
#endif
const sox_version_info_t* info = sox_version_info();
- fprintf(file, "%s: SoX v%s%s%s\n",
- myname,
- info->version,
- info->version_extra ? "-" : "",
- info->version_extra ? info->version_extra : "");
+ fprintf(file, "%s: SoX v%s\n", myname, info->version);
if (sox_globals.verbosity > 3) {
if (info->time)
diff --git a/src/sox.h b/src/sox.h
index bac50354..86919982 100644
--- a/src/sox.h
+++ b/src/sox.h
@@ -1295,7 +1295,6 @@ typedef struct sox_version_info_t {
sox_version_flags_t flags; /**< feature flags = popen | magic | threads |
memopen */
sox_uint32_t version_code; /**< version number = 0x140400 */
char const * version; /**< version string = sox_version(), for
example, "14.4.0" */
- char const * version_extra;/**< version extra info or null =
"PACKAGE_EXTRA", for example, "beta" */
char const * time; /**< build time = "__DATE__ __TIME__", for
example, "Jan 7 2010 03:31:50" */
char const * distro; /**< distro or null = "DISTRO", for example,
"Debian" */
char const * compiler; /**< compiler info or null, for example, "msvc
160040219" */
_______________________________________________
SoX-devel mailing list
SoX-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sox-devel
