X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/38fac18bf81df672821ebbac4130ce41f0a6c61f..346ae1bbcbbe87e79fe2db1f019f014ea64e2175:/configure diff --git a/configure b/configure index 1018214..db8797d 100755 --- a/configure +++ b/configure @@ -1119,7 +1119,7 @@ fi PACKAGE=gob2 -VERSION=1.99.2 +VERSION=1.99.3 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:1125: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -3595,28 +3595,26 @@ fi echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then - echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - else - echo "$as_me:3602: checking for glib-2.0 >= $GLIB_REQUIRED" >&5 + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:3600: checking for glib-2.0 >= $GLIB_REQUIRED" >&5 echo $ECHO_N "checking for glib-2.0 >= $GLIB_REQUIRED... $ECHO_C" >&6 if $PKG_CONFIG --exists "glib-2.0 >= $GLIB_REQUIRED" ; then - echo "$as_me:3606: result: yes" >&5 + echo "$as_me:3604: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes - echo "$as_me:3610: checking GLIB_CFLAGS" >&5 + echo "$as_me:3608: checking GLIB_CFLAGS" >&5 echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED"` - echo "$as_me:3613: result: $GLIB_CFLAGS" >&5 + echo "$as_me:3611: result: $GLIB_CFLAGS" >&5 echo "${ECHO_T}$GLIB_CFLAGS" >&6 - echo "$as_me:3616: checking GLIB_LIBS" >&5 + echo "$as_me:3614: checking GLIB_LIBS" >&5 echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6 GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED"` - echo "$as_me:3619: result: $GLIB_LIBS" >&5 + echo "$as_me:3617: result: $GLIB_LIBS" >&5 echo "${ECHO_T}$GLIB_LIBS" >&6 else GLIB_CFLAGS="" @@ -3627,13 +3625,16 @@ echo "${ECHO_T}$GLIB_LIBS" >&6 echo $GLIB_PKG_ERRORS fi + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi if test $succeeded = yes; then : else - { { echo "$as_me:3636: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 + { { echo "$as_me:3637: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -3718,7 +3719,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:3721: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:3722: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -3894,7 +3895,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:3897: error: ambiguous option: $1 + { { echo "$as_me:3898: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -3913,7 +3914,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:3916: error: unrecognized option: $1 + -*) { { echo "$as_me:3917: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -3963,7 +3964,7 @@ do "doc/gob2.1" ) CONFIG_FILES="$CONFIG_FILES doc/gob2.1" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:3966: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:3967: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4195,7 +4196,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:4198: creating $ac_file" >&5 + { echo "$as_me:4199: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -4213,7 +4214,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4216: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4217: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4226,7 +4227,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4229: error: cannot find input file: $f" >&5 + { { echo "$as_me:4230: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4287,7 +4288,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4290: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:4291: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4298,7 +4299,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4301: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4302: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4311,7 +4312,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4314: error: cannot find input file: $f" >&5 + { { echo "$as_me:4315: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4428,7 +4429,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:4431: $ac_file is unchanged" >&5 + { echo "$as_me:4432: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \