Check-in [fc6bc46b69]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Add Xmu/WinUtil.h detection.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fc6bc46b69600af3c398b515712d6c2e016ca002
User & Date: stu 2014-10-19 06:52:02
Context
2014-10-21
02:26
Update to latest TEA. check-in: 17236d9dfe user: stu tags: trunk
2014-10-19
06:52
Add Xmu/WinUtil.h detection. check-in: fc6bc46b69 user: stu tags: trunk
2012-10-10
22:45
Add include dir for Xmu on hpux. check-in: ca59fe571c user: stu tags: trunk
Changes

Changes to configure.

9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698


9699
9700




9701








9702







9703
9704
9705
9706
9707
9708
9709









9710
9711
9712
9713
9714
9715
9716
$as_echo "#define USE_TCL_STUBS 1" >>confdefs.h


$as_echo "#define USE_TK_STUBS 1" >>confdefs.h


#--------------------------------------------------------------------
# Special bits for special OS's.
# Must be done after TEA_CONFIG_CFLAGS, to obtain the variable $system.
# Should be done before TEA_MAKE_LIB, since TEA_MAKE_LIB does weird things.
#--------------------------------------------------------------------



case $system in
    HP-UX-*.11.*)













    vars="-I/usr/contrib/X11R6/include"







    for i in $vars; do
	PKG_INCLUDES="$PKG_INCLUDES $i"
    done


    ;;
esac










#--------------------------------------------------------------------
# This macro generates a line to use when building a library.  It
# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
# and TEA_LOAD_TCLCONFIG macros above.
#--------------------------------------------------------------------








|
<
<


>
>
|
<
>
>
>
>

>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>





<
<
>
>
>
>
>
>
>
>
>







9687
9688
9689
9690
9691
9692
9693
9694


9695
9696
9697
9698
9699

9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725


9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
$as_echo "#define USE_TCL_STUBS 1" >>confdefs.h


$as_echo "#define USE_TK_STUBS 1" >>confdefs.h


#--------------------------------------------------------------------
# WinUtil.h might not be found under ac_x_includes.


#--------------------------------------------------------------------

winutil_h=Xmu/WinUtil.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $winutil_h" >&5
$as_echo_n "checking for $winutil_h... " >&6; }

found_winutil_h=no
# If it's already under ac_x_includes then nothing to do.
i="$ac_x_includes"
if test -r $i/X11/$winutil_h; then :

    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
$as_echo "$i" >&6; }
    found_winutil_h=yes

fi
# Otherwise check elsewhere.
if test $found_winutil_h = no; then :

    i="/usr/contrib/X11R6/include"
    if test -r $i/X11/$winutil_h; then :

	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
$as_echo "$i" >&6; }
	found_winutil_h=yes

    vars="-I$i"
    for i in $vars; do
	PKG_INCLUDES="$PKG_INCLUDES $i"
    done





fi

fi
if test $found_winutil_h = yes; then :

else
  as_fn_error $? "Can't find $winutil_h" "$LINENO" 5
fi

#--------------------------------------------------------------------
# This macro generates a line to use when building a library.  It
# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
# and TEA_LOAD_TCLCONFIG macros above.
#--------------------------------------------------------------------

Changes to configure.in.

172
173
174
175
176
177
178
179
180
181
182
183


184
185








186
187
188







189
190
191
192
193
194
195
# link against the non-stubbed Tcl library.  Add Tk too if necessary.
#--------------------------------------------------------------------

AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])

#--------------------------------------------------------------------
# Special bits for special OS's.
# Must be done after TEA_CONFIG_CFLAGS, to obtain the variable $system.
# Should be done before TEA_MAKE_LIB, since TEA_MAKE_LIB does weird things.
#--------------------------------------------------------------------



case $system in
    HP-UX-*.11.*)








	TEA_ADD_INCLUDES([-I/usr/contrib/X11R6/include])
    ;;
esac








#--------------------------------------------------------------------
# This macro generates a line to use when building a library.  It
# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
# and TEA_LOAD_TCLCONFIG macros above.
#--------------------------------------------------------------------








|
<
<


>
>
|
<
>
>
>
>
>
>
>
>
|
<
<
>
>
>
>
>
>
>







172
173
174
175
176
177
178
179


180
181
182
183
184

185
186
187
188
189
190
191
192
193


194
195
196
197
198
199
200
201
202
203
204
205
206
207
# link against the non-stubbed Tcl library.  Add Tk too if necessary.
#--------------------------------------------------------------------

AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])

#--------------------------------------------------------------------
# WinUtil.h might not be found under ac_x_includes.


#--------------------------------------------------------------------

winutil_h=Xmu/WinUtil.h
AC_MSG_CHECKING([for $winutil_h])
found_winutil_h=no

# If it's already under ac_x_includes then nothing to do.
i="$ac_x_includes"
AS_IF([test -r $i/X11/$winutil_h],[
    AC_MSG_RESULT([$i])
    found_winutil_h=yes
])
# Otherwise check elsewhere.
AS_IF([test $found_winutil_h = no],[
    i="/usr/contrib/X11R6/include"


    AS_IF([test -r $i/X11/$winutil_h],[
	AC_MSG_RESULT([$i])
	found_winutil_h=yes
	TEA_ADD_INCLUDES([-I$i])
    ])
])
AS_IF([test $found_winutil_h = yes],,[AC_MSG_ERROR([Can't find $winutil_h])])

#--------------------------------------------------------------------
# This macro generates a line to use when building a library.  It
# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
# and TEA_LOAD_TCLCONFIG macros above.
#--------------------------------------------------------------------