diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-09 17:17:57 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-09 17:21:09 +0200 |
| commit | c35f42970ffe9f49dd1480c8ab279d68e443d000 (patch) | |
| tree | 09b379f84a3845bde50b3bf7f58ca2f5d68eaf01 | |
| parent | ed365c1c4d3f2f43ccc074b4c9440f0ddd145615 (diff) | |
| download | meta-openembedded-c35f42970ffe9f49dd1480c8ab279d68e443d000.tar.gz | |
move various GNOME recipes to meta-gnome
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-gnome/recipes-gnome/gconf/gconf-native_2.6.1.bb (renamed from meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb (renamed from meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch (renamed from meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb (renamed from meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb (renamed from meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/hicolor-icon-theme/files/index.theme (renamed from meta-oe/recipes-gnome/hicolor-icon-theme/files/index.theme) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb (renamed from meta-oe/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libidl/libidl-native_0.8.13.bb (renamed from meta-oe/recipes-gnome/libidl/libidl-native_0.8.13.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libidl/libidl.inc (renamed from meta-oe/recipes-gnome/libidl/libidl.inc) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libidl/libidl_0.8.13.bb (renamed from meta-oe/recipes-gnome/libidl/libidl_0.8.13.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/librsvg/librsvg_2.32.1.bbappend (renamed from meta-oe/recipes-gnome/librsvg/librsvg_2.32.1.bbappend) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/configure-lossage.patch (renamed from meta-oe/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb (renamed from meta-oe/recipes-gnome/gnome/orbit2-native_2.14.12.bb) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2.inc (renamed from meta-oe/recipes-gnome/gnome/orbit2.inc) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch (renamed from meta-oe/recipes-gnome/gnome/orbit2/configure-lossage.patch) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 (renamed from meta-oe/recipes-gnome/gnome/files/gtk-doc.m4) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make (renamed from meta-oe/recipes-gnome/gnome/files/gtk-doc.make) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch (renamed from meta-oe/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb (renamed from meta-oe/recipes-gnome/gnome/orbit2_2.14.17.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/gnome/files/acinclude.m4 | 90 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/gnome/files/tasn.m4 | 161 |
22 files changed, 0 insertions, 268 deletions
diff --git a/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb b/meta-gnome/recipes-gnome/gconf/gconf-native_2.6.1.bb index 2ca2dada1e..2ca2dada1e 100644 --- a/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb +++ b/meta-gnome/recipes-gnome/gconf/gconf-native_2.6.1.bb | |||
diff --git a/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb b/meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb index defb5fe2f9..defb5fe2f9 100644 --- a/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb +++ b/meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb | |||
diff --git a/meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch index 67b85470d3..67b85470d3 100644 --- a/meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch +++ b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch | |||
diff --git a/meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb index f1a46a10b2..f1a46a10b2 100644 --- a/meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb +++ b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb | |||
diff --git a/meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb index 2a7f30c11c..2a7f30c11c 100644 --- a/meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb +++ b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb | |||
diff --git a/meta-oe/recipes-gnome/hicolor-icon-theme/files/index.theme b/meta-gnome/recipes-gnome/hicolor-icon-theme/files/index.theme index 0471bd53f2..0471bd53f2 100644 --- a/meta-oe/recipes-gnome/hicolor-icon-theme/files/index.theme +++ b/meta-gnome/recipes-gnome/hicolor-icon-theme/files/index.theme | |||
diff --git a/meta-oe/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb index 1934cdb503..1934cdb503 100644 --- a/meta-oe/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb +++ b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb | |||
diff --git a/meta-oe/recipes-gnome/libidl/libidl-native_0.8.13.bb b/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.13.bb index 834f4af426..834f4af426 100644 --- a/meta-oe/recipes-gnome/libidl/libidl-native_0.8.13.bb +++ b/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.13.bb | |||
diff --git a/meta-oe/recipes-gnome/libidl/libidl.inc b/meta-gnome/recipes-gnome/libidl/libidl.inc index 7a90a7044d..7a90a7044d 100644 --- a/meta-oe/recipes-gnome/libidl/libidl.inc +++ b/meta-gnome/recipes-gnome/libidl/libidl.inc | |||
diff --git a/meta-oe/recipes-gnome/libidl/libidl_0.8.13.bb b/meta-gnome/recipes-gnome/libidl/libidl_0.8.13.bb index 732178d037..732178d037 100644 --- a/meta-oe/recipes-gnome/libidl/libidl_0.8.13.bb +++ b/meta-gnome/recipes-gnome/libidl/libidl_0.8.13.bb | |||
diff --git a/meta-oe/recipes-gnome/librsvg/librsvg_2.32.1.bbappend b/meta-gnome/recipes-gnome/librsvg/librsvg_2.32.1.bbappend index daea68c012..daea68c012 100644 --- a/meta-oe/recipes-gnome/librsvg/librsvg_2.32.1.bbappend +++ b/meta-gnome/recipes-gnome/librsvg/librsvg_2.32.1.bbappend | |||
diff --git a/meta-oe/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/configure-lossage.patch index 5fc1de5610..5fc1de5610 100644 --- a/meta-oe/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/configure-lossage.patch | |||
diff --git a/meta-oe/recipes-gnome/gnome/orbit2-native_2.14.12.bb b/meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb index 1db2496c35..1db2496c35 100644 --- a/meta-oe/recipes-gnome/gnome/orbit2-native_2.14.12.bb +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb | |||
diff --git a/meta-oe/recipes-gnome/gnome/orbit2.inc b/meta-gnome/recipes-gnome/orbit2/orbit2.inc index 51978909be..51978909be 100644 --- a/meta-oe/recipes-gnome/gnome/orbit2.inc +++ b/meta-gnome/recipes-gnome/orbit2/orbit2.inc | |||
diff --git a/meta-oe/recipes-gnome/gnome/orbit2/configure-lossage.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch index 7485a0ce0c..7485a0ce0c 100644 --- a/meta-oe/recipes-gnome/gnome/orbit2/configure-lossage.patch +++ b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch | |||
diff --git a/meta-oe/recipes-gnome/gnome/files/gtk-doc.m4 b/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 index 3ec41666b2..3ec41666b2 100644 --- a/meta-oe/recipes-gnome/gnome/files/gtk-doc.m4 +++ b/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 | |||
diff --git a/meta-oe/recipes-gnome/gnome/files/gtk-doc.make b/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make index 354ffb7c66..354ffb7c66 100644 --- a/meta-oe/recipes-gnome/gnome/files/gtk-doc.make +++ b/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make | |||
diff --git a/meta-oe/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch index f629e506dd..f629e506dd 100644 --- a/meta-oe/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch +++ b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch | |||
diff --git a/meta-oe/recipes-gnome/gnome/orbit2_2.14.17.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb index 47f632793c..47f632793c 100644 --- a/meta-oe/recipes-gnome/gnome/orbit2_2.14.17.bb +++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb | |||
diff --git a/meta-oe/recipes-gnome/gnome/files/acinclude.m4 b/meta-oe/recipes-gnome/gnome/files/acinclude.m4 deleted file mode 100644 index 53518fb2eb..0000000000 --- a/meta-oe/recipes-gnome/gnome/files/acinclude.m4 +++ /dev/null | |||
| @@ -1,90 +0,0 @@ | |||
| 1 | ## this one is commonly used with AM_PATH_PYTHONDIR ... | ||
| 2 | dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) | ||
| 3 | dnl Check if a module containing a given symbol is visible to python. | ||
| 4 | AC_DEFUN(AM_CHECK_PYMOD, | ||
| 5 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
| 6 | py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` | ||
| 7 | AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) | ||
| 8 | AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ | ||
| 9 | ifelse([$2],[], [prog=" | ||
| 10 | import sys | ||
| 11 | try: | ||
| 12 | import $1 | ||
| 13 | except ImportError: | ||
| 14 | sys.exit(1) | ||
| 15 | except: | ||
| 16 | sys.exit(0) | ||
| 17 | sys.exit(0)"], [prog=" | ||
| 18 | import $1 | ||
| 19 | $1.$2"]) | ||
| 20 | if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC | ||
| 21 | then | ||
| 22 | eval "py_cv_mod_$py_mod_var=yes" | ||
| 23 | else | ||
| 24 | eval "py_cv_mod_$py_mod_var=no" | ||
| 25 | fi | ||
| 26 | ]) | ||
| 27 | py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` | ||
| 28 | if test "x$py_val" != xno; then | ||
| 29 | AC_MSG_RESULT(yes) | ||
| 30 | ifelse([$3], [],, [$3 | ||
| 31 | ])dnl | ||
| 32 | else | ||
| 33 | AC_MSG_RESULT(no) | ||
| 34 | ifelse([$4], [],, [$4 | ||
| 35 | ])dnl | ||
| 36 | fi | ||
| 37 | ]) | ||
| 38 | |||
| 39 | dnl a macro to check for ability to create python extensions | ||
| 40 | dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) | ||
| 41 | dnl function also defines PYTHON_INCLUDES | ||
| 42 | AC_DEFUN([AM_CHECK_PYTHON_HEADERS], | ||
| 43 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
| 44 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
| 45 | dnl deduce PYTHON_INCLUDES | ||
| 46 | AC_ARG_WITH(python-includes, | ||
| 47 | [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
| 48 | if test x$py_exec_prefix != x; then | ||
| 49 | PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
| 50 | else | ||
| 51 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
| 52 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
| 53 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
| 54 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
| 55 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
| 56 | fi | ||
| 57 | fi | ||
| 58 | AC_SUBST(PYTHON_INCLUDES) | ||
| 59 | dnl check if the headers exist: | ||
| 60 | save_CPPFLAGS="$CPPFLAGS" | ||
| 61 | CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" | ||
| 62 | AC_TRY_CPP([#include <Python.h>],dnl | ||
| 63 | [AC_MSG_RESULT(found) | ||
| 64 | $1],dnl | ||
| 65 | [AC_MSG_RESULT(not found) | ||
| 66 | $2]) | ||
| 67 | CPPFLAGS="$save_CPPFLAGS" | ||
| 68 | ]) | ||
| 69 | |||
| 70 | dnl | ||
| 71 | dnl JH_ADD_CFLAG(FLAG) | ||
| 72 | dnl checks whether the C compiler supports the given flag, and if so, adds | ||
| 73 | dnl it to $CFLAGS. If the flag is already present in the list, then the | ||
| 74 | dnl check is not performed. | ||
| 75 | AC_DEFUN([JH_ADD_CFLAG], | ||
| 76 | [ | ||
| 77 | case " $CFLAGS " in | ||
| 78 | *@<:@\ \ @:>@$1@<:@\ \ @:>@*) | ||
| 79 | ;; | ||
| 80 | *) | ||
| 81 | save_CFLAGS="$CFLAGS" | ||
| 82 | CFLAGS="$CFLAGS $1" | ||
| 83 | AC_MSG_CHECKING([whether [$]CC understands $1]) | ||
| 84 | AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) | ||
| 85 | AC_MSG_RESULT($jh_has_option) | ||
| 86 | if test $jh_has_option = no; then | ||
| 87 | CFLAGS="$save_CFLAGS" | ||
| 88 | fi | ||
| 89 | ;; | ||
| 90 | esac]) | ||
diff --git a/meta-oe/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch b/meta-oe/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch deleted file mode 100644 index b65b3608d4..0000000000 --- a/meta-oe/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Index: libproxy-0.2.3/src/lib/dns.c | ||
| 2 | =================================================================== | ||
| 3 | --- libproxy-0.2.3.orig/src/lib/dns.c 2009-08-14 14:13:21.123557812 -0700 | ||
| 4 | +++ libproxy-0.2.3/src/lib/dns.c 2009-08-14 14:13:31.954575500 -0700 | ||
| 5 | @@ -17,11 +17,11 @@ | ||
| 6 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 7 | ******************************************************************************/ | ||
| 8 | |||
| 9 | +#define __USE_BSD | ||
| 10 | #include <string.h> | ||
| 11 | #include <errno.h> | ||
| 12 | #include <stdio.h> | ||
| 13 | #include <netdb.h> | ||
| 14 | -#define __USE_BSD | ||
| 15 | #include <unistd.h> | ||
| 16 | |||
| 17 | #include "misc.h" | ||
diff --git a/meta-oe/recipes-gnome/gnome/files/tasn.m4 b/meta-oe/recipes-gnome/gnome/files/tasn.m4 deleted file mode 100644 index 6df32085a8..0000000000 --- a/meta-oe/recipes-gnome/gnome/files/tasn.m4 +++ /dev/null | |||
| @@ -1,161 +0,0 @@ | |||
| 1 | dnl Autoconf macros for libtasn1 | ||
| 2 | dnl $id$ | ||
| 3 | |||
| 4 | # Modified for LIBTASN1 -- nmav | ||
| 5 | # Configure paths for LIBGCRYPT | ||
| 6 | # Shamelessly stolen from the one of XDELTA by Owen Taylor | ||
| 7 | # Werner Koch 99-12-09 | ||
| 8 | |||
| 9 | dnl AM_PATH_LIBTASN1([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) | ||
| 10 | dnl Test for libtasn1, and define LIBTASN1_CFLAGS and LIBTASN1_LIBS | ||
| 11 | dnl | ||
| 12 | AC_DEFUN([AM_PATH_LIBTASN1], | ||
| 13 | [dnl | ||
| 14 | dnl Get the cflags and libraries from the libtasn1-config script | ||
| 15 | dnl | ||
| 16 | AC_ARG_WITH(libtasn1-prefix, | ||
| 17 | [ --with-libtasn1-prefix=PFX Prefix where libtasn1 is installed (optional)], | ||
| 18 | libtasn1_config_prefix="$withval", libtasn1_config_prefix="") | ||
| 19 | |||
| 20 | if test x$libtasn1_config_prefix != x ; then | ||
| 21 | if test x${LIBTASN1_CONFIG+set} != xset ; then | ||
| 22 | LIBTASN1_CONFIG=$libtasn1_config_prefix/bin/libtasn1-config | ||
| 23 | fi | ||
| 24 | fi | ||
| 25 | |||
| 26 | AC_PATH_PROG(LIBTASN1_CONFIG, libtasn1-config, no) | ||
| 27 | min_libtasn1_version=ifelse([$1], ,0.1.0,$1) | ||
| 28 | AC_MSG_CHECKING(for libtasn1 - version >= $min_libtasn1_version) | ||
| 29 | no_libtasn1="" | ||
| 30 | if test "$LIBTASN1_CONFIG" = "no" ; then | ||
| 31 | no_libtasn1=yes | ||
| 32 | else | ||
| 33 | LIBTASN1_CFLAGS=`$LIBTASN1_CONFIG $libtasn1_config_args --cflags` | ||
| 34 | LIBTASN1_LIBS=`$LIBTASN1_CONFIG $libtasn1_config_args --libs` | ||
| 35 | libtasn1_config_version=`$LIBTASN1_CONFIG $libtasn1_config_args --version` | ||
| 36 | |||
| 37 | |||
| 38 | ac_save_CFLAGS="$CFLAGS" | ||
| 39 | ac_save_LIBS="$LIBS" | ||
| 40 | CFLAGS="$CFLAGS $LIBTASN1_CFLAGS" | ||
| 41 | LIBS="$LIBS $LIBTASN1_LIBS" | ||
| 42 | dnl | ||
| 43 | dnl Now check if the installed libtasn1 is sufficiently new. Also sanity | ||
| 44 | dnl checks the results of libtasn1-config to some extent | ||
| 45 | dnl | ||
| 46 | rm -f conf.libtasn1test | ||
| 47 | AC_TRY_RUN([ | ||
| 48 | #include <stdio.h> | ||
| 49 | #include <stdlib.h> | ||
| 50 | #include <string.h> | ||
| 51 | #include <libtasn1.h> | ||
| 52 | |||
| 53 | int | ||
| 54 | main () | ||
| 55 | { | ||
| 56 | system ("touch conf.libtasn1test"); | ||
| 57 | |||
| 58 | if( strcmp( asn1_check_version(NULL), "$libtasn1_config_version" ) ) | ||
| 59 | { | ||
| 60 | printf("\n*** 'libtasn1-config --version' returned %s, but LIBTASN1 (%s)\n", | ||
| 61 | "$libtasn1_config_version", asn1_check_version(NULL) ); | ||
| 62 | printf("*** was found! If libtasn1-config was correct, then it is best\n"); | ||
| 63 | printf("*** to remove the old version of LIBTASN1. You may also be able to fix the error\n"); | ||
| 64 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
| 65 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
| 66 | printf("*** required on your system.\n"); | ||
| 67 | printf("*** If libtasn1-config was wrong, set the environment variable LIBTASN1_CONFIG\n"); | ||
| 68 | printf("*** to point to the correct copy of libtasn1-config, and remove the file config.cache\n"); | ||
| 69 | printf("*** before re-running configure\n"); | ||
| 70 | } | ||
| 71 | else if ( strcmp(asn1_check_version(NULL), LIBTASN1_VERSION ) ) | ||
| 72 | { | ||
| 73 | printf("\n*** LIBTASN1 header file (version %s) does not match\n", LIBTASN1_VERSION); | ||
| 74 | printf("*** library (version %s)\n", asn1_check_version(NULL) ); | ||
| 75 | } | ||
| 76 | else | ||
| 77 | { | ||
| 78 | if ( asn1_check_version( "$min_libtasn1_version" ) ) | ||
| 79 | { | ||
| 80 | return 0; | ||
| 81 | } | ||
| 82 | else | ||
| 83 | { | ||
| 84 | printf("no\n*** An old version of LIBTASN1 (%s) was found.\n", | ||
| 85 | asn1_check_version(NULL) ); | ||
| 86 | printf("*** You need a version of LIBTASN1 newer than %s. The latest version of\n", | ||
| 87 | "$min_libtasn1_version" ); | ||
| 88 | printf("*** LIBTASN1 is always available from ftp://gnutls.hellug.gr/pub/gnutls/libtasn1.\n"); | ||
| 89 | printf("*** \n"); | ||
| 90 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
| 91 | printf("*** probably means that the wrong copy of the libtasn1-config shell script is\n"); | ||
| 92 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
| 93 | printf("*** of LIBTASN1, but you can also set the LIBTASN1_CONFIG environment to point to the\n"); | ||
| 94 | printf("*** correct copy of libtasn1-config. (In this case, you will have to\n"); | ||
| 95 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
| 96 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
| 97 | } | ||
| 98 | } | ||
| 99 | return 0; | ||
| 100 | } | ||
| 101 | ],, no_libtasn1=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
| 102 | CFLAGS="$ac_save_CFLAGS" | ||
| 103 | LIBS="$ac_save_LIBS" | ||
| 104 | fi | ||
| 105 | |||
| 106 | if test "x$no_libtasn1" = x ; then | ||
| 107 | AC_MSG_RESULT(yes) | ||
| 108 | ifelse([$2], , :, [$2]) | ||
| 109 | else | ||
| 110 | if test -f conf.libtasn1test ; then | ||
| 111 | : | ||
| 112 | else | ||
| 113 | AC_MSG_RESULT(no) | ||
| 114 | fi | ||
| 115 | if test "$LIBTASN1_CONFIG" = "no" ; then | ||
| 116 | echo "*** The libtasn1-config script installed by LIBTASN1 could not be found" | ||
| 117 | echo "*** If LIBTASN1 was installed in PREFIX, make sure PREFIX/bin is in" | ||
| 118 | echo "*** your path, or set the LIBTASN1_CONFIG environment variable to the" | ||
| 119 | echo "*** full path to libtasn1-config." | ||
| 120 | else | ||
| 121 | if test -f conf.libtasn1test ; then | ||
| 122 | : | ||
| 123 | else | ||
| 124 | echo "*** Could not run libtasn1 test program, checking why..." | ||
| 125 | CFLAGS="$CFLAGS $LIBTASN1_CFLAGS" | ||
| 126 | LIBS="$LIBS $LIBTASN1_LIBS" | ||
| 127 | AC_TRY_LINK([ | ||
| 128 | #include <stdio.h> | ||
| 129 | #include <stdlib.h> | ||
| 130 | #include <string.h> | ||
| 131 | #include <libtasn1.h> | ||
| 132 | ], [ return !!asn1_check_version(NULL); ], | ||
| 133 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
| 134 | echo "*** that the run-time linker is not finding LIBTASN1 or finding the wrong" | ||
| 135 | echo "*** version of LIBTASN1. If it is not finding LIBTASN1, you'll need to set your" | ||
| 136 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
| 137 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
| 138 | echo "*** is required on your system" | ||
| 139 | echo "***" | ||
| 140 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
| 141 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" | ||
| 142 | echo "***" ], | ||
| 143 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
| 144 | echo "*** exact error that occured. This usually means LIBTASN1 was incorrectly installed" | ||
| 145 | echo "*** or that you have moved LIBTASN1 since it was installed. In the latter case, you" | ||
| 146 | echo "*** may want to edit the libtasn1-config script: $LIBTASN1_CONFIG" ]) | ||
| 147 | CFLAGS="$ac_save_CFLAGS" | ||
| 148 | LIBS="$ac_save_LIBS" | ||
| 149 | fi | ||
| 150 | fi | ||
| 151 | LIBTASN1_CFLAGS="" | ||
| 152 | LIBTASN1_LIBS="" | ||
| 153 | ifelse([$3], , :, [$3]) | ||
| 154 | fi | ||
| 155 | rm -f conf.libtasn1test | ||
| 156 | AC_SUBST(LIBTASN1_CFLAGS) | ||
| 157 | AC_SUBST(LIBTASN1_LIBS) | ||
| 158 | ]) | ||
| 159 | |||
| 160 | dnl *-*wedit:notab*-* Please keep this as the last line. | ||
| 161 | |||
