From 79bc80feabe0f093a1b5a1a446346de52e2ae675 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 18 Apr 2004 15:04:17 +0000 Subject: [PATCH] Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, reported by Pedro Sun Apr 18 16:59:21 2004 Soeren Sandmann * configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, reported by Pedro RODRIGUEZ, about compilation problems when Xcursor is installed in a non-standard location. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ configure.in | 2 -- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 357fd27408..0ed78e277a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Apr 18 16:59:21 2004 Soeren Sandmann + + * configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, + reported by Pedro RODRIGUEZ, about compilation problems when + Xcursor is installed in a non-standard location. + Sun Apr 18 16:15:15 2004 Soeren Sandmann Support for _NET_WM_USER_TIME (bug 115650). Patch by Elijah diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 357fd27408..0ed78e277a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Apr 18 16:59:21 2004 Soeren Sandmann + + * configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, + reported by Pedro RODRIGUEZ, about compilation problems when + Xcursor is installed in a non-standard location. + Sun Apr 18 16:15:15 2004 Soeren Sandmann Support for _NET_WM_USER_TIME (bug 115650). Patch by Elijah diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 357fd27408..0ed78e277a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Apr 18 16:59:21 2004 Soeren Sandmann + + * configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, + reported by Pedro RODRIGUEZ, about compilation problems when + Xcursor is installed in a non-standard location. + Sun Apr 18 16:15:15 2004 Soeren Sandmann Support for _NET_WM_USER_TIME (bug 115650). Patch by Elijah diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 357fd27408..0ed78e277a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Apr 18 16:59:21 2004 Soeren Sandmann + + * configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, + reported by Pedro RODRIGUEZ, about compilation problems when + Xcursor is installed in a non-standard location. + Sun Apr 18 16:15:15 2004 Soeren Sandmann Support for _NET_WM_USER_TIME (bug 115650). Patch by Elijah diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 357fd27408..0ed78e277a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Apr 18 16:59:21 2004 Soeren Sandmann + + * configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586, + reported by Pedro RODRIGUEZ, about compilation problems when + Xcursor is installed in a non-standard location. + Sun Apr 18 16:15:15 2004 Soeren Sandmann Support for _NET_WM_USER_TIME (bug 115650). Patch by Elijah diff --git a/configure.in b/configure.in index 4306a76fef..b3579af983 100644 --- a/configure.in +++ b/configure.in @@ -1240,7 +1240,6 @@ if test "x$gdktarget" = "xx11"; then fi fi - GDK_EXTRA_CFLAGS= if test $pango_omitted_x_deps = yes ; then GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs $x_libs $GDK_EXTRA_LIBS" else @@ -1304,7 +1303,6 @@ if test "x$gdktarget" = "xlinux-fb"; then AM_CONDITIONAL(ENABLE_FB_MANAGER, false) fi - GDK_EXTRA_CFLAGS="" if test $pango_omitted_ft2_deps = yes ; then GDK_EXTRA_LIBS="$FREETYPE_LIBS $GDK_EXTRA_LIBS" fi