diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 13 | ||||
| -rw-r--r-- | acconfig.h | 2 | ||||
| -rw-r--r-- | configure.in | 16 |
9 files changed, 102 insertions, 7 deletions
@@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e7f97e788c..47c60fd556 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e7f97e788c..47c60fd556 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e7f97e788c..47c60fd556 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e7f97e788c..47c60fd556 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e7f97e788c..47c60fd556 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e7f97e788c..47c60fd556 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Mon Oct 29 12:21:49 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_FILE to check for a + file since it always spits warnings about cross compilation, + use -f instead. It's not like we cross compile properly + anyways. + + * configure.in (gtktargetlib): Move call to AC_PROG_CC + to suppress autoconf warning. + + * acconfig.h: Add some missing #undefs from recent + Win32 additions. + Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config diff --git a/acconfig.h b/acconfig.h index 17b47293dc..4b30305852 100644 --- a/acconfig.h +++ b/acconfig.h @@ -19,6 +19,7 @@ #undef GTK_COMPILED_WITH_DEBUGGING #undef HAVE_CATGETS +#undef HAVE_DIMM_H #undef HAVE_DIRENT_H #undef HAVE_GETTEXT #undef HAVE_IPC_H @@ -31,6 +32,7 @@ #undef HAVE_SHAPE_EXT #undef HAVE_SYS_SELECT_H #undef HAVE_SYS_TIME_H +#undef HAVE_WINSOCK_H #undef HAVE_WINTAB #undef HAVE_XCONVERTCASE #undef HAVE_XFT diff --git a/configure.in b/configure.in index 051877e2a1..48dacc8019 100644 --- a/configure.in +++ b/configure.in @@ -102,6 +102,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_CONFIG_HEADER(config.h) dnl Initialize libtool +AC_PROG_CC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL @@ -216,7 +217,6 @@ AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}") AM_SANITY_CHECK # Checks for programs. -AC_PROG_CC AC_ISC_POSIX AM_PROG_CC_STDC AC_PROG_INSTALL @@ -391,12 +391,14 @@ if test ${with_wintab+set} = set && test $with_wintab != no; then #include <wintab.h>], [], [AC_MSG_RESULT(yes) - AC_CHECK_FILE([$with_wintab/lib/i386/wntab32x.lib], - [have_wintab=yes - AC_DEFINE(HAVE_WINTAB) - WINTAB_LIB="$with_wintab/lib/i386/wntab32x.lib" - AC_SUBST(WINTAB_LIB)], - [have_wintab=no]) + if test -f $with_wintab/lib/i386/wntab32x.lib ; then + have_wintab=yes + AC_DEFINE(HAVE_WINTAB) + WINTAB_LIB="$with_wintab/lib/i386/wntab32x.lib" + AC_SUBST(WINTAB_LIB) + else + have_wintab=no + fi ], [AC_MSG_RESULT(no) have_wintab=no]) |