Changeset 2986

Show
Ignore:
Timestamp:
12/03/99 01:22:44 (15 years ago)
Author:
ucacoxh
Message:

- Added X pre- and post- library gubbins to make tk library check more robust.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/configure.in

    r2985 r2986  
    157157AC_SUBST(X_CFLAGS) 
    158158AC_SUBST(X_LIBS) 
    159  
     159AC_SUBST(X_EXTRA_LIBS) 
     160AC_SUBST(X_PRE_LIBS) 
    160161# TCL/TK #################################################################### 
    161162# have to use pwd because srcdir is helpfully chosen to be . and check header 
     
    178179AC_CHECK_LIB(tcl8.0,  
    179180        Tcl_Init, 
    180         TCL_LIB_NAME=tcl8.0, 
     181        TCL_LIB="-L$TCL_LIB -ltcl8.0", 
    181182        [AC_CHECK_LIB(tcl80,  
    182183                Tcl_Init, 
    183                 TCL_LIB_NAME=tcl80, 
     184                TCL_LIB="-L$TCL_LIB -ltcl80", 
    184185                [ 
    185186                        echo "Could not find Tcl library.  One of the following halted progess:" 
     
    214215AC_CHECK_LIB(tk8.0,  
    215216        Tk_Init, 
    216         TK_LIB_NAME=tk8.0, 
     217        TK_LIB="-L$TK_LIB -ltk8.0", 
    217218        [AC_CHECK_LIB(tk80,  
    218219                Tk_Init, 
    219                 TK_LIB_NAME=tk80, 
     220                TK_LIB="-L$TK_LIB -ltk80", 
    220221                [ 
    221222                        echo "Could not find Tk library.  One of the following halted progess:" 
     
    225226                        exit 
    226227                ], 
    227                 -L${TCL_LIB} -L${TK_LIB} -l$TCL_LIB_NAME -L$ac_x_libraries -lm -lXext -lX11)], 
    228         -L${TCL_LIB} -L${TK_LIB} -l$TCL_LIB_NAME -L$ac_x_libraries -lm -lXext -lX11) 
     228                -L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm)], 
     229         -L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS  -lXext -lX11 $X_EXTRA_LIBS -lm) 
     230 
     231AC_SUBST(TCL_INC) 
     232AC_SUBST(TCL_LIB) 
     233AC_SUBST(TK_INC) 
     234AC_SUBST(TK_LIB) 
    229235 
    230236# XXX Add check for common ##################################################