diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /glib-2.0/files | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'glib-2.0/files')
| -rw-r--r-- | glib-2.0/files/glibconfig-sysdefs.h | 6 | ||||
| -rw-r--r-- | glib-2.0/files/gtk-doc.patch | 59 |
2 files changed, 0 insertions, 65 deletions
diff --git a/glib-2.0/files/glibconfig-sysdefs.h b/glib-2.0/files/glibconfig-sysdefs.h deleted file mode 100644 index 1329e7f21c..0000000000 --- a/glib-2.0/files/glibconfig-sysdefs.h +++ /dev/null @@ -1,6 +0,0 @@ -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/glib-2.0/files/gtk-doc.patch b/glib-2.0/files/gtk-doc.patch deleted file mode 100644 index 4b9c234e21..0000000000 --- a/glib-2.0/files/gtk-doc.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- glib/acinclude.m4 2004-05-08 11:14:46.000000000 +0100 -+++ glib/acinclude.m4 2004-05-08 11:14:55.000000000 +0100 -@@ -446,3 +446,56 @@ - ]) - - -+dnl -*- mode: autoconf -*- -+ -+# serial 1 -+ -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ AC_ARG_WITH(html-dir, -+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, -+ [with_html_dir='${datadir}/gtk-doc/html']) -+ HTML_DIR="$with_html_dir" -+ AC_SUBST(HTML_DIR) -+ -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE(gtk-doc, -+ AC_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [default=no]]),, -+ enable_gtk_doc=no) -+ -+ have_gtk_doc=no -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then -+ have_gtk_doc=yes -+ fi -+ -+ dnl do we want to do a version check? -+ifelse([$1],[],, -+ [gtk_doc_min_version=$1 -+ if test "$have_gtk_doc" = yes; then -+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) -+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ have_gtk_doc=no -+ fi -+ fi -+]) -+ if test x$enable_gtk_doc = xyes; then -+ if test "$have_gtk_doc" != yes; then -+ enable_gtk_doc=no -+ fi -+ fi -+ -+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -+]) |