From 762c7d55d768cd96aa760d7bae84e65ee3eb63fe Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 8 Sep 2002 07:46:15 +0000 Subject: [PATCH] Add AM_CONDITIONAL calls also in the non-x11 branch. Otherwise we get 2002-09-08 Tor Lillqvist * 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 * gtk/gtkfilesel.c: Include + + * 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 * gtk/gtktoolbar.c (get_button_relief): call @@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor is implemented (in GLib) only on native Win32. (#91683, Masahiro Sakai) - * Include diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3720d648fd..16a2c36b21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-09-08 Tor Lillqvist + + * 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 * gtk/gtktoolbar.c (get_button_relief): call @@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor is implemented (in GLib) only on native Win32. (#91683, Masahiro Sakai) - * Include diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3720d648fd..16a2c36b21 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-09-08 Tor Lillqvist + + * 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 * gtk/gtktoolbar.c (get_button_relief): call @@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor is implemented (in GLib) only on native Win32. (#91683, Masahiro Sakai) - * Include diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3720d648fd..16a2c36b21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-09-08 Tor Lillqvist + + * 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 * gtk/gtktoolbar.c (get_button_relief): call @@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor is implemented (in GLib) only on native Win32. (#91683, Masahiro Sakai) - * Include diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3720d648fd..16a2c36b21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-09-08 Tor Lillqvist + + * 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 * gtk/gtktoolbar.c (get_button_relief): call @@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor is implemented (in GLib) only on native Win32. (#91683, Masahiro Sakai) - * Include diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3720d648fd..16a2c36b21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-09-08 Tor Lillqvist + + * 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 * gtk/gtktoolbar.c (get_button_relief): call @@ -81,11 +90,12 @@ Fri Sep 6 12:41:16 2002 Owen Taylor is implemented (in GLib) only on native Win32. (#91683, Masahiro Sakai) - * Include diff --git a/configure.in b/configure.in index 10739730cb..e92cf4e870 100644 --- a/configure.in +++ b/configure.in @@ -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