Commit 762c7d55 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Add AM_CONDITIONAL calls also in the non-x11 branch. Otherwise we get

2002-09-08  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Add AM_CONDITIONAL calls also in the non-x11
	branch. Otherwise we get "conditional \"$1\" was never defined.
	Usually this means the macro was only invoked conditionally."
	errors when running configure if using automake 1.6a. Yeah, I know
	that autogen.sh says to use automake 1.4, but on Win32 I more or
	less have to use the bleeding edge. I think.

Fix an earlier ChangeLog entry to include the file name:

2002-08-31  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
parent fd303c56
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Sat Sep 7 21:24:55 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (get_button_relief): call
......@@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
too. (#91843, Masahiro Sakai)
2002-08-26 Tor Lillqvist <tml@iki.fi>
......
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Sat Sep 7 21:24:55 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (get_button_relief): call
......@@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
too. (#91843, Masahiro Sakai)
2002-08-26 Tor Lillqvist <tml@iki.fi>
......
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Sat Sep 7 21:24:55 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (get_button_relief): call
......@@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
too. (#91843, Masahiro Sakai)
2002-08-26 Tor Lillqvist <tml@iki.fi>
......
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Sat Sep 7 21:24:55 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (get_button_relief): call
......@@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
too. (#91843, Masahiro Sakai)
2002-08-26 Tor Lillqvist <tml@iki.fi>
......
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Sat Sep 7 21:24:55 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (get_button_relief): call
......@@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
too. (#91843, Masahiro Sakai)
2002-08-26 Tor Lillqvist <tml@iki.fi>
......
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Sat Sep 7 21:24:55 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (get_button_relief): call
......@@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
too. (#91843, Masahiro Sakai)
2002-08-26 Tor Lillqvist <tml@iki.fi>
......
......@@ -1188,6 +1188,8 @@ if test "x$gdktarget" = "xx11"; then
AM_CONDITIONAL(USE_X11, true)
else
AM_CONDITIONAL(HAVE_XFT, false)
AM_CONDITIONAL(XINPUT_XFREE, false)
AM_CONDITIONAL(USE_X11, false)
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment