Change for OpenWatcom 1.4

Modified Files:
     configure configure.in utils/tmdy_getopt.h

diff --git a/ChangeLog b/ChangeLog
index 628cc47..7e33fc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-08  Keishi Suenaga <s_keishi@mutt.freemai.ne.jp>
+
+       * configure configure.in utils/tmdy_getopt.h: fix for OpenWatcom 1.4
+
 2005-12-19  Stas Sergeev <stsp@aknet.ru>
 
        * interface/server_c.c: Add server version.

diff --git a/configure b/configure
index 0de56ca..43a4608 100755 (executable)
--- a/configure
+++ b/configure
@@ -4402,7 +4402,7 @@ case "$target" in
          WATCOM_C=yes
          CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
          WATCOM_LDFLAGS=
-         EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib libcmt.lib"
+         EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib"
          ;;
       "xcl "*)
          test -n "$SHLD" || SHLD="link -dll"

diff --git a/configure.in b/configure.in
index cc0a7ac..2fdffe4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -233,7 +233,7 @@ case "$target" in
          WATCOM_C=yes
          CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
          WATCOM_LDFLAGS=
-         EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib libcmt.lib"
+         EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib"
          ;;
       "xcl "*) 
          test -n "$SHLD" || SHLD="link -dll"

diff --git a/utils/tmdy_getopt.h b/utils/tmdy_getopt.h
index ef525d4..e4446c0 100644 (file)
--- a/utils/tmdy_getopt.h
+++ b/utils/tmdy_getopt.h
@@ -25,7 +25,7 @@
 #ifndef __TMDY_GETOPT_H__
 #define __TMDY_GETOPT_H__
 
-#if defined(HAVE_UNISTD_H) && !defined(__WATCOMC__)
+#if defined(HAVE_UNISTD_H) && defined(HAVE_GETOPT)
 /* getopt() declaration here */
 #include <unistd.h>
 #else