[Pkg-electronics-commits] [gnucap] 15/43: move config parts from md.h to main/config.h

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit af6cf6c5db7f4684e3b283f800bd19fc0303019c
Author: Felix Salfelder <felix at salfelder.org>
Date:   Fri Mar 24 20:42:29 2017 +0000

    move config parts from md.h to main/config.h
    
    postpone STEPFILE, needs more work perhaps
---
 include/md.h     | 40 ++--------------------------------------
 main/config.h.in | 43 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/include/md.h b/include/md.h
index d37ebf9..47ba314 100644
--- a/include/md.h
+++ b/include/md.h
@@ -72,53 +72,17 @@ enum {
 #define I_PROMPT "gnucap> "
 #define CKT_PROMPT ">"
 #define ANTI_COMMENT "*>"
-#define DEFAULT_LANGUAGE "acs"
 /*--------------------------------------------------------------------------*/
 #if defined(__WIN32__)
 #define	ENDDIR		"/\\"
 #define PATHSEP		';'
-#if !defined(DEFAULT_PLUGINS)
-  #define DEFAULT_PLUGINS "gnucap-default-plugins.dll"
-#endif
-#if !defined(SYSTEMSTARTFILE)
-  #define SYSTEMSTARTFILE "gnucap.rc"
-#endif
-#if !defined(SYSTEMSTARTPATH)
-  #define SYSTEMSTARTPATH OS::getenv("PATH")
-#endif
-#if !defined(USERSTARTFILE)
-  #define USERSTARTFILE "gnucap.rc"
-#endif
-#if !defined(USERSTARTPATH)
-  #define USERSTARTPATH OS::getenv("HOME")
-#endif
-#if !defined(STEPFILE)
-  #define STEPFILE "/tmp/SXXXXXX"
-#endif
 #define SHELL		OS::getenv("COMSPEC")
-/*--------------------------------------------------------------------------*/
+#define STEPFILE "/tmp/SXXXXXX"
 #else
 #define	ENDDIR		"/"
 #define PATHSEP		':'
-#if !defined(DEFAULT_PLUGINS)
-  #define DEFAULT_PLUGINS "gnucap-default-plugins.so"
-#endif
-#if !defined(SYSTEMSTARTFILE)
-  #define SYSTEMSTARTFILE "gnucap.rc"
-#endif
-#if !defined(SYSTEMSTARTPATH)
-  #define SYSTEMSTARTPATH OS::getenv("PATH")
-#endif
-#if !defined(USERSTARTFILE)
-  #define USERSTARTFILE ".gnucaprc"
-#endif
-#if !defined(USERSTARTPATH)
-  #define USERSTARTPATH OS::getenv("HOME")
-#endif
-#if !defined(STEPFILE)
-  #define STEPFILE "/tmp/SXXXXXX"
-#endif
 #define SHELL OS::getenv("SHELL")
+#define STEPFILE "/tmp/SXXXXXX"
 #endif
 /*--------------------------------------------------------------------------*/
 /* machine and compiler patches */
diff --git a/main/config.h.in b/main/config.h.in
index 07b1810..14b7420 100644
--- a/main/config.h.in
+++ b/main/config.h.in
@@ -1,6 +1,47 @@
 #ifndef GNUCAP_MAIN_CONFIG_H
 #define GNUCAP_MAIN_CONFIG_H
-
+/*--------------------------------------------------------------------------*/
+/* configuration */
 #define GNUCAP_PLUGPATH "@pkglibdir@"
+/*--------------------------------------------------------------------------*/
+/* user interface preferences */
+#define DEFAULT_LANGUAGE "acs"
+/*--------------------------------------------------------------------------*/
+/* installation setup */
+#if defined(__WIN32__)
+#if !defined(DEFAULT_PLUGINS)
+  #define DEFAULT_PLUGINS "gnucap-default-plugins.dll"
+#endif
+#if !defined(SYSTEMSTARTFILE)
+  #define SYSTEMSTARTFILE "gnucap.rc"
+#endif
+#if !defined(SYSTEMSTARTPATH)
+  #define SYSTEMSTARTPATH OS::getenv("PATH")
+#endif
+#if !defined(USERSTARTFILE)
+  #define USERSTARTFILE "gnucap.rc"
+#endif
+#if !defined(USERSTARTPATH)
+  #define USERSTARTPATH OS::getenv("HOME")
+#endif
+/*--------------------------------------------------------------------------*/
+#else
+#if !defined(DEFAULT_PLUGINS)
+  #define DEFAULT_PLUGINS "gnucap-default-plugins.so"
+#endif
+#if !defined(SYSTEMSTARTFILE)
+  #define SYSTEMSTARTFILE "gnucap.rc"
+#endif
+#if !defined(SYSTEMSTARTPATH)
+  #define SYSTEMSTARTPATH OS::getenv("PATH")
+#endif
+#if !defined(USERSTARTFILE)
+  #define USERSTARTFILE ".gnucaprc"
+#endif
+#if !defined(USERSTARTPATH)
+  #define USERSTARTPATH OS::getenv("HOME")
+#endif
+#endif
+/*--------------------------------------------------------------------------*/
 
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git