Changeset 23116

Timestamp:

Mar 3, 2009, 2:52:19 PM (17 years ago)

Author:

Paul Price

Message:

Adding function psLibDependencies to get the dependencies and their versions.

Location:

trunk/psLib/src/sys

Files:

• psConfigure.c (modified) (1 diff)
• psConfigure.h (modified) (1 diff)

trunk/psLib/src/sys/psConfigure.c

@@ -67 +67 @@
 }
 
+psString psLibDependencies(void)
+{
+    psString deps = NULL;               // Dependencies, to return
+    float cfitsioVersion;               // CFITSIO version number
+    psStringAppend(&deps, "cfitsio-%.3f gsl-%s %s",
+                   fits_get_version(&cfitsioVersion), gsl_version, fftwf_version);
+
+#ifdef HAVE_PSDB
+    psStringAppend(&deps, " mysql-%s", mysql_get_client_info());
+#endif
+
+    return deps;
+}
+
 psString psLibVersionLong(void)
 {
     psString version = psLibVersion();  // Version, to return
     psString source = psLibSource();    // Source
-
-    float cfitsioVersion;               // CFITSIO version number
+    psString deps = psLibDependencies();// Dependencies
 
     psStringPrepend(&version, "psLib ");
-    psStringAppend(&version, " from %s, built %s, %s with cfitsio (%.3f), gsl (%s), fftw (%s)",
-                   source, __DATE__, __TIME__, fits_get_version(&cfitsioVersion), gsl_version,
-                   fftwf_version);
+    psStringAppend(&version, " from %s, built %s, %s with %s",
+                   source, __DATE__, __TIME__, deps);
     psFree(source);
-
-#ifdef HAVE_PSDB
-    psStringAppend(&version, ", mysql (%s)", mysql_get_client_info());
-#endif
+    psFree(deps);
 
 #ifdef __OPTIMIZE__

trunk/psLib/src/sys/psConfigure.h

@@ -39 +39 @@
 psString psLibSource(void);
 
+/** Get psLib dependencies' versions
+ *
+ * Returns the psLib dependency versions as a string.
+ *
+ * @return psString: String with dependencies.
+ */
+psString psLibDependencies(void);
+
 /** Get current psLib version (full identification)
  *