fix configure script, add qt option, other minor fixes

Patch:    ivtools-040129-johnston-005
For:      ivtools-1.1.2
Author:   [email protected]
Subject:  fix configure script, add qt option, other minor fixes
Requires:

This is an intermediate patch to ivtools-1.1.2.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- minor fix to ParamList::urltest

- make ComValue printing insert "(null)" when string pointer is null.

- eval func doc fix

- remove test for C++ include directory from configure script
(configure.in).  This was troublesome, and was only being used for
"make depend", which no longer needed it.

- add configure test for Qt library.

- default -display to "localhost:0.0"

Index: Attribute/paramlist.c
diff -c Attribute/paramlist.c:1.1 Attribute/paramlist.c:1.2
*** Attribute/paramlist.c:1.1	Fri Jan  9 11:42:18 2004
--- src/Attribute/paramlist.c	Thu Jan 29 10:51:46 2004
***************
*** 888,894 ****

   boolean ParamList::urltest(const char* buf) {
     if (!buf) return false;
!   static boolean file_url_ok = bincheck("w3c") || bincheck("curl");
     return
       strncasecmp("http://", buf, 7)==0 ||
       strncasecmp("ftp://", buf, 6)==0 ||
--- 888,894 ----

   boolean ParamList::urltest(const char* buf) {
     if (!buf) return false;
!   static boolean file_url_ok = url_use_ok();
     return
       strncasecmp("http://", buf, 7)==0 ||
       strncasecmp("ftp://", buf, 6)==0 ||
Index: ComTerp/comvalue.c
diff -c ComTerp/comvalue.c:1.1 ComTerp/comvalue.c:1.2
*** ComTerp/comvalue.c:1.1	Fri Jan  9 11:42:26 2004
--- src/ComTerp/comvalue.c	Thu Jan 29 10:51:49 2004
***************
*** 158,169 ****
   	case ComValue::SymbolType:
   	  if (brief) {
   	    if (svp->global_flag()) out << "global(";
! 	    out << symbol_pntr( svp->symbol_ref());
   	    if (svp->global_flag()) out << ")";
   	  } else {
   	    title = "symbol( ";
   	    symbol = symbol_pntr( svp->symbol_ref() );
! 	    out << title << symbol;
   	    counter = strlen(title) + strlen(symbol);
   	    while( ++counter < 32 ) out << ' ';
   	    out << ")   narg " << svp->narg() << "  nkey " << svp->nkey() <<
--- 158,170 ----
   	case ComValue::SymbolType:
   	  if (brief) {
   	    if (svp->global_flag()) out << "global(";
! 	    symbol = symbol_pntr(svp->symbol_ref());
! 	    out << (symbol ? symbol : "(null)");
   	    if (svp->global_flag()) out << ")";
   	  } else {
   	    title = "symbol( ";
   	    symbol = symbol_pntr( svp->symbol_ref() );
! 	    out << title << (symbol ? symbol : "(null)");
   	    counter = strlen(title) + strlen(symbol);
   	    while( ++counter < 32 ) out << ' ';
   	    out << ")   narg " << svp->narg() << "  nkey " << svp->nkey() <<
Index: ComTerp/ctrlfunc.h
diff -c ComTerp/ctrlfunc.h:1.1 ComTerp/ctrlfunc.h:1.2
*** ComTerp/ctrlfunc.h:1.1	Fri Jan  9 11:42:26 2004
--- src/ComTerp/ctrlfunc.h	Thu Jan 29 10:51:49 2004
***************
*** 97,103 ****

       virtual void execute();
       virtual const char* docstring() {
!       return "str|lst=%s(cmdstr) -- evaluate string as commands, 
optionally return symbol instead of nil"; }

   };

--- 97,103 ----

       virtual void execute();
       virtual const char* docstring() {
!       return "str|lst=%s(cmdstr :symret) -- evaluate string as 
commands, optionally return symbol instead of nil"; }

   };

Index: config_ivtools/config.defs.in
diff -c config_ivtools/config.defs.in:1.1 
config_ivtools/config.defs.in:1.2
*** config_ivtools/config.defs.in:1.1	Fri Jan  9 11:46:46 2004
--- config/config.defs.in	Thu Jan 29 10:52:21 2004
***************
*** 38,43 ****
--- 38,49 ----
   #define IueLibDir @IUELIBS@
   #endif

+ #if @QT_ENABLED@
+ #define QtDir @QT@
+ #define QtLibDir @QTLIBS@
+ #define QtIncDir @QTINCS@
+ #endif
+
   #undef CCDriver
   #define CCDriver @CXX@

Index: config_ivtools/config.mk
diff -c config_ivtools/config.mk:1.1 config_ivtools/config.mk:1.2
*** config_ivtools/config.mk:1.1	Fri Jan  9 11:46:46 2004
--- config/config.mk	Thu Jan 29 10:52:21 2004
***************
*** 1,4 ****
! XCONFIGDIR = NONE/X11/config
   ABSTOP = /Users/scott/src/ivtools-1.1
   CPU = DARWIN
   LIBSTDCPLUSPLUS2 = 0
--- 1,4 ----
! XCONFIGDIR = /usr/X11R6/lib/X11/config
   ABSTOP = /Users/scott/src/ivtools-1.1
   CPU = DARWIN
   LIBSTDCPLUSPLUS2 = 0
Index: config_ivtools/gcc.def
diff -c config_ivtools/gcc.def:1.1 config_ivtools/gcc.def:1.2
*** config_ivtools/gcc.def:1.1	Fri Jan  9 11:46:46 2004
--- config/gcc.def	Thu Jan 29 10:52:21 2004
***************
*** 2,16 ****
    * Other definitions for gcc/g++.
    */

-      GPLUSPLUS_INCLUDE_DIR = GPlusPlusIncludeDir
             TOOL_INCLUDE_DIR = ToolIncludeDir

   #ifndef DependCCFlags
   #if 1 /* without -D__GNUG__ */
! #define DependCCFlags -w -DMAKEDEPEND $(CCDEFINES) $(CCINCLUDES) 
-I$(GPLUSPLUS_INCLUDE_DIR) \
   		      -I$(TOOL_INCLUDE_DIR) -UHAVE_ACE
   #else /* with -D__GNUG__ */
! #define DependCCFlags -D__GNUG__ -DMAKEDEPEND $(CCDEFINES) 
$(CCINCLUDES) -I$(GPLUSPLUS_INCLUDE_DIR) \
   		      -I$(TOOL_INCLUDE_DIR) -UHAVE_ACE
   #endif
   #endif
--- 2,15 ----
    * Other definitions for gcc/g++.
    */

             TOOL_INCLUDE_DIR = ToolIncludeDir

   #ifndef DependCCFlags
   #if 1 /* without -D__GNUG__ */
! #define DependCCFlags -w -DMAKEDEPEND $(CCDEFINES) $(CCINCLUDES) \
   		      -I$(TOOL_INCLUDE_DIR) -UHAVE_ACE
   #else /* with -D__GNUG__ */
! #define DependCCFlags -D__GNUG__ -DMAKEDEPEND $(CCDEFINES) 
$(CCINCLUDES) \
   		      -I$(TOOL_INCLUDE_DIR) -UHAVE_ACE
   #endif
   #endif
Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.1 config_ivtools/params.def:1.2
*** config_ivtools/params.def:1.1	Fri Jan  9 11:46:47 2004
--- config/params.def	Thu Jan 29 10:52:21 2004
***************
*** 464,471 ****
   #endif
   #endif

   #ifndef OtherCCDefines
! #define OtherCCDefines $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) 
$(IUE_DEFINES)
   #endif

             CCDEFINES = CCDefines
--- 464,479 ----
   #endif
   #endif

+ #ifndef QtCCDefines
+ #ifdef QtDir
+ #define QtCCDefines /**/
+ #else
+ #define QtCCDefines /**/
+ #endif
+ #endif
+
   #ifndef OtherCCDefines
! #define OtherCCDefines $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) 
$(IUE_DEFINES) $(QT_DEFINES)
   #endif

             CCDEFINES = CCDefines
***************
*** 480,485 ****
--- 488,494 ----
    CLIPPOLY_CCDEFINES = ClipPolyCCDefines
         ACE_CCDEFINES = AceCCDefines
         IUE_CCDEFINES = IueCCDefines
+        QT_CCDEFINES = QtCCDefines

   /*
    * Define the includes passed to the CC driver when we compile a C++ 
file.
***************
*** 542,549 ****
   #endif
   #endif

   #ifndef OtherCCIncludes
! #define OtherCCIncludes $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) 
$(IUE_CCINCLUDES)
   #endif

            CCINCLUDES = CCIncludes
--- 551,566 ----
   #endif
   #endif

+ #ifndef QtCCIncludes
+ #ifdef QtDir
+ #define QtCCIncludes -I$(QTINCS)
+ #else
+ #define QtCCIncludes /**/
+ #endif
+ #endif
+
   #ifndef OtherCCIncludes
! #define OtherCCIncludes $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) 
$(IUE_CCINCLUDES) $(QT_CCINCLUDES)
   #endif

            CCINCLUDES = CCIncludes
***************
*** 559,564 ****
--- 576,582 ----
   CLIPPOLY_CCINCLUDES = ClipPolyCCIncludes
        ACE_CCINCLUDES = AceCCIncludes
        IUE_CCINCLUDES = IueCCIncludes
+       QT_CCINCLUDES = QtCCIncludes
   #ifdef ClipPolyDir
           CLIPPOLYDIR = ClipPolyDir
   #endif
***************
*** 571,576 ****
--- 589,597 ----
   #ifdef IueDir
                IUEDIR = IueDir
   #endif
+ #ifdef QtDir
+               QTDIR = QtDir
+ #endif

   /*
    * Define the flags passed to the CC driver when we link a C++ 
program.
***************
*** 980,987 ****
   #define IueLibBase libIUE.so   /* only for installing symbolic link */
   #endif

   #ifndef OtherCCLdLibs
! #define OtherCCLdLibs $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) 
$(IUE_CCLDLIBS)
   #endif

   #ifndef SharedCCLdLibs
--- 1001,1020 ----
   #define IueLibBase libIUE.so   /* only for installing symbolic link */
   #endif

+ #ifndef QtLibDir
+ #ifdef QtDir
+ #define QtLibDir $(QTLIBS)
+ #else
+ #define QtLibDir /**/
+ #endif
+ #endif
+
+ #ifndef QtLibBase
+ #define QtLibBase libQt.so  /* only for installing symbolic link */
+ #endif
+
   #ifndef OtherCCLdLibs
! #define OtherCCLdLibs $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) 
$(IUE_CCLDLIBS) $(QT_CCLDLIBS)
   #endif

   #ifndef SharedCCLdLibs
***************
*** 1009,1014 ****
--- 1042,1050 ----
          IUE_CCLDLIBS = IueCCLdLibs
             IUELIBDIR = IueLibDir
            IUELIBBASE = IueLibBase
+         QT_CCLDLIBS = QtCCLdLibs
+            QTLIBDIR = QtLibDir
+           QTLIBBASE = QtLibBase
   	
   /*
    * Define how to install a program, library, header, man page, or 
data file.
Index: include_std/strstream.h
diff -c include_std/strstream.h:1.1 include_std/strstream.h:removed
*** include_std/strstream.h:1.1	Fri Jan  9 11:46:11 2004
--- src/include/ivstd/strstream.h	Thu Jan 29 10:52:17 2004
***************
*** 1,6 ****
- #include <strstream>
- using std::strstream;
- using std::istrstream;
- using std::ostrstream;
- using std::strstreambuf;
-
--- 0 ----
Index: src_interviews/session.c
diff -c src_interviews/session.c:1.1 src_interviews/session.c:1.2
*** src_interviews/session.c:1.1	Fri Jan  9 11:42:39 2004
--- src/InterViews/session.c	Thu Jan 29 10:51:51 2004
***************
*** 725,731 ****
       } else if (style_->find_attribute(String("display"), name)) {
   	default_ = Display::open(name);
       } else {
! 	default_ = Display::open();
       }
       if (default_ == nil) {
   	if (name.length() > 0) {
--- 725,731 ----
       } else if (style_->find_attribute(String("display"), name)) {
   	default_ = Display::open(name);
       } else {
! 	default_ = Display::open("localhost:0.0");
       }
       if (default_ == nil) {
   	if (name.length() > 0) {
*** /dev/null	 Thu Jan 29 10:52:24 PST 2004
--- patches/ivtools-040129-johnston-005
*************** patches/ivtools-040129-johnston-005
*** 0 ****
--- 1 ----
+ ivtools-040129-johnston-005



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn