diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-12-23 19:03:25 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-12-23 19:03:25 +0000 |
| commit | 4169220a9f970264b6b1ff75bfd065c380827a83 (patch) | |
| tree | 18efa3106d19999771079a9639c84236c14adde9 /packages/xscreensaver | |
| parent | 75dabaea1044bc9ceebeae6ed2cec16cddb04b84 (diff) | |
xscreensaver: Fix QA issue in do_configure
Diffstat (limited to 'packages/xscreensaver')
| -rw-r--r-- | packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch | 72 | ||||
| -rw-r--r-- | packages/xscreensaver/xscreensaver_4.22.bb | 5 |
2 files changed, 77 insertions, 0 deletions
diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch new file mode 100644 index 0000000000..723d8bd956 --- /dev/null +++ b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch @@ -0,0 +1,72 @@ +--- xscreensaver-4.22/configure.in.orig 2007-12-23 18:33:43.000000000 +0000 ++++ xscreensaver-4.22/configure.in 2007-12-23 18:35:33.000000000 +0000 +@@ -944,9 +944,6 @@ + # + AC_DEFUN(AC_CHECK_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -955,9 +952,6 @@ + # + AC_DEFUN(AC_EGREP_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_EGREP_HEADER([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -966,9 +960,6 @@ + # + AC_DEFUN(AC_TRY_X_COMPILE, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -982,9 +973,6 @@ + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" + +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +@@ -1005,9 +993,6 @@ + # + AC_DEFUN(AC_TRY_X_RUN, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_RUN([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -2763,9 +2748,6 @@ + EOF + + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:` +@@ -3395,9 +3377,6 @@ + DEPEND_DEFINES= + + +-if test \! -z "$includedir" ; then +- INCLUDES="$INCLUDES -I$includedir" +-fi + + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index 6c2776d6aa..cac3776724 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -8,9 +8,12 @@ SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" +PR = "r1" + SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://fixes.patch;patch=1 \ file://configure.in.patch;patch=1 \ + file://configure.in-includedir.patch;patch=1 \ file://XScreenSaver" # xscreensaver-demo is a glade app @@ -35,6 +38,8 @@ FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*" do_configure_prepend() { sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in + + export includedir="/lib" } do_compile() { |