View | Details | Raw Unified | Return to bug 117897
Collapse All | Expand All

(-)configure (-20 / +19 lines)
Lines 1334-1340 Link Here
1334
fi;
1334
fi;
1335
1335
1336
1336
1337
if test "$enable_debug" == "yes" ; then
1337
if test "$enable_debug" = "yes" ; then
1338
    DEBUG="yes"
1338
    DEBUG="yes"
1339
else
1339
else
1340
    DEBUG="no"
1340
    DEBUG="no"
Lines 1347-1353 Link Here
1347
fi;
1347
fi;
1348
1348
1349
1349
1350
if test "$enable_static" == "yes" ; then
1350
if test "$enable_static" = "yes" ; then
1351
    STATIC="yes"
1351
    STATIC="yes"
1352
else
1352
else
1353
    STATIC="no"
1353
    STATIC="no"
Lines 1472-1478 Link Here
1472
fi
1472
fi
1473
1473
1474
1474
1475
TCLSH=`which tclsh`
1475
TCLSH=`which tclsh8.4`
1476
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
1476
VERSION=`echo "puts $::tcl_version ; exit" | ${TCLSH}`
1477
# Check whether --enable-version-check or --disable-version-check was given.
1477
# Check whether --enable-version-check or --disable-version-check was given.
1478
if test "${enable_version_check+set}" = set; then
1478
if test "${enable_version_check+set}" = set; then
Lines 1484-1490 Link Here
1484
1484
1485
OLDV=`expr $VERSION \< 8.4`
1485
OLDV=`expr $VERSION \< 8.4`
1486
1486
1487
if test "x${version_ok}" == "xyes" -a $OLDV == 1; then
1487
if test "x${version_ok}" = "xyes" -a "$OLDV" = "1"; then
1488
    { { echo "$as_me:$LINENO: error: Your current Tcl/Tk installation has a version number of $VERSION. The minimal version required for aMSN to run is Tcl/Tk 8.4" >&5
1488
    { { echo "$as_me:$LINENO: error: Your current Tcl/Tk installation has a version number of $VERSION. The minimal version required for aMSN to run is Tcl/Tk 8.4" >&5
1489
echo "$as_me: error: Your current Tcl/Tk installation has a version number of $VERSION. The minimal version required for aMSN to run is Tcl/Tk 8.4" >&2;}
1489
echo "$as_me: error: Your current Tcl/Tk installation has a version number of $VERSION. The minimal version required for aMSN to run is Tcl/Tk 8.4" >&2;}
1490
   { (exit 1); exit 1; }; }
1490
   { (exit 1); exit 1; }; }
Lines 2425-2431 Link Here
2425
2425
2426
2426
2427
CC_INSTALLED=`which $CC`
2427
CC_INSTALLED=`which $CC`
2428
if test "x${CC_INSTALLED}" == "x"; then
2428
if test "x${CC_INSTALLED}" = "x"; then
2429
    { { echo "$as_me:$LINENO: error: You need a C compiler (gcc) to compiler aMSN. Please install gcc and try again" >&5
2429
    { { echo "$as_me:$LINENO: error: You need a C compiler (gcc) to compiler aMSN. Please install gcc and try again" >&5
2430
echo "$as_me: error: You need a C compiler (gcc) to compiler aMSN. Please install gcc and try again" >&2;}
2430
echo "$as_me: error: You need a C compiler (gcc) to compiler aMSN. Please install gcc and try again" >&2;}
2431
   { (exit 1); exit 1; }; }
2431
   { (exit 1); exit 1; }; }
Lines 2788-2794 Link Here
2788
2788
2789
2789
2790
CXX_INSTALLED=`which $CXX`
2790
CXX_INSTALLED=`which $CXX`
2791
if test "x${CXX_INSTALLED}" == "x"; then
2791
if test "x${CXX_INSTALLED}" = "x"; then
2792
     { { echo "$as_me:$LINENO: error: You need a C++ compiler (g++) to compiler aMSN. Please install g++ and try again" >&5
2792
     { { echo "$as_me:$LINENO: error: You need a C++ compiler (g++) to compiler aMSN. Please install g++ and try again" >&5
2793
echo "$as_me: error: You need a C++ compiler (g++) to compiler aMSN. Please install g++ and try again" >&2;}
2793
echo "$as_me: error: You need a C++ compiler (g++) to compiler aMSN. Please install g++ and try again" >&2;}
2794
   { (exit 1); exit 1; }; }
2794
   { (exit 1); exit 1; }; }
Lines 2864-2873 Link Here
2864
			if test "x${version_ok}" != "xyes"; then
2864
			if test "x${version_ok}" != "xyes"; then
2865
			VERSION=${TCL_VERSION}
2865
			VERSION=${TCL_VERSION}
2866
			fi
2866
			fi
2867
2868
				if  test "x${TCL_INC_DIR}" != "x" -o "x${TCL_INC_SPEC}" != "x" \
2867
				if  test "x${TCL_INC_DIR}" != "x" -o "x${TCL_INC_SPEC}" != "x" \
2869
					-o "x${TCL_INCLUDE_DIR}" != "x" -o "x${TCL_INCLUDE_SPEC}" != "x"; then
2868
					-o "x${TCL_INCLUDE_DIR}" != "x" -o "x${TCL_INCLUDE_SPEC}" != "x"; then
2870
				if test "x${TCL_VERSION}" == "x${VERSION}" ; then
2869
				if test "x${TCL_VERSION}" = "x${VERSION}" ; then
2871
				TCL_LIB_DIR=`cd $i; pwd`
2870
				TCL_LIB_DIR=`cd $i; pwd`
2872
				break;
2871
				break;
2873
				fi
2872
				fi
Lines 2924-2938 Link Here
2924
	TCL_INC_DIR=$TCL_INCLUDE_SPEC
2923
	TCL_INC_DIR=$TCL_INCLUDE_SPEC
2925
	fi
2924
	fi
2926
2925
2927
	if test "x${TCL_INC_DIR}" == "x"; then
2926
	if test "x${TCL_INC_DIR}" = "x"; then
2928
	TCL_INC_DIR=$TCL_INCLUDE_DIR
2927
	TCL_INC_DIR=$TCL_INCLUDE_DIR
2929
	fi
2928
	fi
2930
2929
2931
	if test "x${TCL_INC_DIR}" == "x" -a -f ${TCL_PREFIX}/include/tcl.h; then
2930
	if test "x${TCL_INC_DIR}" = "x" -a -f ${TCL_PREFIX}/include/tcl.h; then
2932
	TCL_INC_DIR=${TCL_PREFIX}/include
2931
	TCL_INC_DIR=${TCL_PREFIX}/include
2933
	fi
2932
	fi
2934
2933
2935
	if test "x${TCL_INC_DIR}" == "x"; then
2934
	if test "x${TCL_INC_DIR}" = "x"; then
2936
	{ { echo "$as_me:$LINENO: error: You dot not have a devel package of Tcl" >&5
2935
	{ { echo "$as_me:$LINENO: error: You dot not have a devel package of Tcl" >&5
2937
echo "$as_me: error: You dot not have a devel package of Tcl" >&2;}
2936
echo "$as_me: error: You dot not have a devel package of Tcl" >&2;}
2938
   { (exit 1); exit 1; }; }
2937
   { (exit 1); exit 1; }; }
Lines 2946-2952 Link Here
2946
	TCL_INC_SPEC=$TCL_INC_DIR
2945
	TCL_INC_SPEC=$TCL_INC_DIR
2947
2946
2948
	framework=`echo "${TCL_BASE}" | grep -- "-framework"`
2947
	framework=`echo "${TCL_BASE}" | grep -- "-framework"`
2949
	if test "x${framework}" == "x"; then
2948
	if test "x${framework}" = "x"; then
2950
	TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_BASE}"
2949
	TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_BASE}"
2951
	fi
2950
	fi
2952
	TCL_STUB_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_STUB_BASE}"
2951
	TCL_STUB_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_STUB_BASE}"
Lines 3016-3022 Link Here
3016
3015
3017
		if  test "x${TK_INC_DIR}" != "x" -o "x${TK_INC_SPEC}" != "x" \
3016
		if  test "x${TK_INC_DIR}" != "x" -o "x${TK_INC_SPEC}" != "x" \
3018
				-o "x${TK_INCLUDE_DIR}" != "x" -o "x${TK_INCLUDE_SPEC}" != "x"; then
3017
				-o "x${TK_INCLUDE_DIR}" != "x" -o "x${TK_INCLUDE_SPEC}" != "x"; then
3019
				if test "x${TK_VERSION}" == "x${VERSION}"; then
3018
				if test "x${TK_VERSION}" = "x${VERSION}"; then
3020
			TK_LIB_DIR=`cd $i; pwd`
3019
			TK_LIB_DIR=`cd $i; pwd`
3021
			break;
3020
			break;
3022
			fi
3021
			fi
Lines 3060-3078 Link Here
3060
	TK_INC_DIR=$TK_INC_SPEC
3059
	TK_INC_DIR=$TK_INC_SPEC
3061
	fi
3060
	fi
3062
3061
3063
	if  test "x${TK_INCLUDE_SPEC}" != "x"; then
3062
	#if  test "x${TK_INCLUDE_SPEC}" != "x"; then
3064
	TK_INC_DIR=$TK_INCLUDE_SPEC
3063
	#TK_INC_DIR=$TK_INCLUDE_SPEC
3065
	fi
3064
	#fi
3066
3065
3067
	if test "x${TK_INC_DIR}" == "x"; then
3066
	if test "x${TK_INC_DIR}" = "x"; then
3068
	TK_INC_DIR=$TK_INCLUDE_DIR
3067
	TK_INC_DIR=$TK_INCLUDE_DIR
3069
	fi
3068
	fi
3070
3069
3071
	if test "x${TK_INC_DIR}" == "x" -a -f ${TK_PREFIX}/include/tk.h; then
3070
	if test "x${TK_INC_DIR}" = "x" -a -f ${TK_PREFIX}/include/tk.h; then
3072
	TK_INC_DIR=${TK_PREFIX}/include
3071
	TK_INC_DIR=${TK_PREFIX}/include
3073
	fi
3072
	fi
3074
3073
3075
	if test "x${TK_INC_DIR}" == "x"; then
3074
	if test "x${TK_INC_DIR}" = "x"; then
3076
	{ { echo "$as_me:$LINENO: error: You dot not have a devel package of Tk" >&5
3075
	{ { echo "$as_me:$LINENO: error: You dot not have a devel package of Tk" >&5
3077
echo "$as_me: error: You dot not have a devel package of Tk" >&2;}
3076
echo "$as_me: error: You dot not have a devel package of Tk" >&2;}
3078
   { (exit 1); exit 1; }; }
3077
   { (exit 1); exit 1; }; }
Lines 3186-3192 Link Here
3186
  echo $ECHO_N "(cached) $ECHO_C" >&6
3185
  echo $ECHO_N "(cached) $ECHO_C" >&6
3187
else
3186
else
3188
      # Double quotes because CPP needs to be expanded
3187
      # Double quotes because CPP needs to be expanded
3189
    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
3188
    for CPP in "$CC -E $CFLAGS $CPPFLAGS" "$CC -E -traditional-cpp" "/lib/cpp"
3190
    do
3189
    do
3191
      ac_preproc_ok=false
3190
      ac_preproc_ok=false
3192
for ac_c_preproc_warn_flag in '' yes
3191
for ac_c_preproc_warn_flag in '' yes

Return to bug 117897