Changeset 10492

Timestamp:

Dec 5, 2006, 5:53:33 PM (20 years ago)

Author:

eugene

Message:

added -version option

Location:

trunk/psphot/src

Files:

• psphotArguments.c (modified) (1 diff)
• psphotVersion.c (modified) (2 diffs)

trunk/psphot/src/psphotArguments.c

@@ -15 +15 @@
         psString version;
         version = psphotVersionLong();    fprintf (stdout, "%s", version); psFree (version);
-# if (HAVE_KAPA) 
-        fprintf (stdout, " with libkapa\n");
-# else  
-        fprintf (stdout, " WITHOUT libkapa\n");
-# endif
         version = psModulesVersionLong(); fprintf (stdout, "%s\n", version); psFree (version);
         version = psLibVersionLong();     fprintf (stdout, "%s\n", version); psFree (version);
-        
-# if (HAVE_KAPA) 
-        version = ohana_version();        fprintf (stdout, "%s\n", version); free (version);
-        version = libdvo_version();       fprintf (stdout, "%s\n", version); free (version);
-# endif
         exit (0);
     }

trunk/psphot/src/psphotVersion.c

@@ -1 +1 @@
 #include "psphot.h"
+
+# if (HAVE_KAPA) 
+# include <kapa.h>
+# endif
 
 static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name
@@ -15 +19 @@
     psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
     psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
+
+# if (HAVE_KAPA) 
+    psString ohanaVersion = psStringStripCVS (ohana_version(), "Name");
+    psString libdvoVersion = psStringStripCVS (libdvo_version(), "Name");
+
+    psStringAppend (&version, " with libkapa (ohana %s, libdvo: %s)\n", ohanaVersion, libdvoVersion);
+    psFree (ohanaVersion);
+    psFree (libdvoVersion);
+# else  
+    psStringAppend (&version, " WITHOUT libkapa\n");
+# endif
+
     psFree(tag);
     return version;