summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstwo <stwo>2009-04-14 20:31:08 (GMT)
committerstwo <stwo>2009-04-14 20:31:08 (GMT)
commite218cedbc86a8adac1e37f7b63f86f384807e357 (patch)
treec62d2ba54c2a697b6aaa962b7ade0c77f4ae5562
parentbbd019938dab66489feb97ca505283e55125bc48 (diff)
downloadtk-e218cedbc86a8adac1e37f7b63f86f384807e357.zip
tk-e218cedbc86a8adac1e37f7b63f86f384807e357.tar.gz
tk-e218cedbc86a8adac1e37f7b63f86f384807e357.tar.bz2
Removed -Wno-implicit-int from CFLAGS_WARNING.\nRegen unix/configure.
-rw-r--r--ChangeLog4
-rwxr-xr-xunix/configure14
-rw-r--r--unix/tcl.m42
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c9041841..391eef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-14 Stuart Cassoff <stwo@users.sourceforge.net>
+
+ * unix/tcl.m4: Removed -Wno-implicit-int from CFLAGS_WARNING.
+
2009-04-10 Don Porter <dgp@users.sourceforge.net>
*** 8.5.7 TAGGED FOR RELEASE ***
diff --git a/unix/configure b/unix/configure
index c59687f..50192b1 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4849,7 +4849,7 @@ fi
CFLAGS_OPTIMIZE=-O
if test "$GCC" = yes; then
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
+ CFLAGS_WARNING="-Wall"
else
CFLAGS_WARNING=""
@@ -9904,7 +9904,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9912,7 +9912,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9939,7 +9939,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -9953,18 +9953,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c7f26ca..9d653b1 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1142,7 +1142,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
AS_IF([test "$GCC" = yes], [
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
+ CFLAGS_WARNING="-Wall"
], [CFLAGS_WARNING=""])
TCL_NEEDS_EXP_FILE=0
TCL_BUILD_EXP_FILE=""