Diff of /trunk/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 20 by harbaum, Sat Jun 27 19:18:40 2009 UTC revision 21 by harbaum, Sun Jul 5 17:38:06 2009 UTC
# Line 1  Line 1 
1  #! /bin/sh  #! /bin/sh
2  # Guess values for system-dependent variables and create Makefiles.  # Guess values for system-dependent variables and create Makefiles.
3  # Generated by GNU Autoconf 2.61 for GPXView 0.7.0.  # Generated by GNU Autoconf 2.61 for GPXView 0.7.1.
4  #  #
5  # Report bugs to <till@harbaum.org>.  # Report bugs to <till@harbaum.org>.
6  #  #
# Line 574  SHELL=${CONFIG_SHELL-/bin/sh} Line 574  SHELL=${CONFIG_SHELL-/bin/sh}
574  # Identity of this package.  # Identity of this package.
575  PACKAGE_NAME='GPXView'  PACKAGE_NAME='GPXView'
576  PACKAGE_TARNAME='gpxview'  PACKAGE_TARNAME='gpxview'
577  PACKAGE_VERSION='0.7.0'  PACKAGE_VERSION='0.7.1'
578  PACKAGE_STRING='GPXView 0.7.0'  PACKAGE_STRING='GPXView 0.7.1'
579  PACKAGE_BUGREPORT='till@harbaum.org'  PACKAGE_BUGREPORT='till@harbaum.org'
580    
581  ac_unique_file="src/main.c"  ac_unique_file="src/main.c"
# Line 648  sqlite3_CFLAGS Line 648  sqlite3_CFLAGS
648  sqlite3_LIBS  sqlite3_LIBS
649  hildon_help_CFLAGS  hildon_help_CFLAGS
650  hildon_help_LIBS  hildon_help_LIBS
651    gpsbt_CFLAGS
652    gpsbt_LIBS
653  liblocation_CFLAGS  liblocation_CFLAGS
654  liblocation_LIBS  liblocation_LIBS
655  EXTRA_OBJS  EXTRA_OBJS
# Line 686  sqlite3_CFLAGS Line 688  sqlite3_CFLAGS
688  sqlite3_LIBS  sqlite3_LIBS
689  hildon_help_CFLAGS  hildon_help_CFLAGS
690  hildon_help_LIBS  hildon_help_LIBS
691    gpsbt_CFLAGS
692    gpsbt_LIBS
693  liblocation_CFLAGS  liblocation_CFLAGS
694  liblocation_LIBS  liblocation_LIBS
695  gtk_CFLAGS  gtk_CFLAGS
# Line 1194  if test "$ac_init_help" = "long"; then Line 1198  if test "$ac_init_help" = "long"; then
1198    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1199    # This message is too long to be a string in the A/UX 3.1 sh.    # This message is too long to be a string in the A/UX 3.1 sh.
1200    cat <<_ACEOF    cat <<_ACEOF
1201  \`configure' configures GPXView 0.7.0 to adapt to many kinds of systems.  \`configure' configures GPXView 0.7.1 to adapt to many kinds of systems.
1202    
1203  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1204    
# Line 1255  fi Line 1259  fi
1259    
1260  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1261    case $ac_init_help in    case $ac_init_help in
1262       short | recursive ) echo "Configuration of GPXView 0.7.0:";;       short | recursive ) echo "Configuration of GPXView 0.7.1:";;
1263     esac     esac
1264    cat <<\_ACEOF    cat <<\_ACEOF
1265    
# Line 1301  Some influential environment variables: Line 1305  Some influential environment variables:
1305                C compiler flags for hildon_help, overriding pkg-config                C compiler flags for hildon_help, overriding pkg-config
1306    hildon_help_LIBS    hildon_help_LIBS
1307                linker flags for hildon_help, overriding pkg-config                linker flags for hildon_help, overriding pkg-config
1308      gpsbt_CFLAGS
1309                  C compiler flags for gpsbt, overriding pkg-config
1310      gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config
1311    liblocation_CFLAGS    liblocation_CFLAGS
1312                C compiler flags for liblocation, overriding pkg-config                C compiler flags for liblocation, overriding pkg-config
1313    liblocation_LIBS    liblocation_LIBS
# Line 1375  fi Line 1382  fi
1382  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1383  if $ac_init_version; then  if $ac_init_version; then
1384    cat <<\_ACEOF    cat <<\_ACEOF
1385  GPXView configure 0.7.0  GPXView configure 0.7.1
1386  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1387    
1388  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1389  cat >config.log <<_ACEOF Line 1396  cat >config.log <<_ACEOF
1396  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1397  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1398    
1399  It was created by GPXView $as_me 0.7.0, which was  It was created by GPXView $as_me 0.7.1, which was
1400  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1401    
1402    $ $0 $@    $ $0 $@
# Line 3767  fi Line 3774  fi
3774    
3775    # prefer gpsbt over liblocation as we got complaints regarding liblocation    # prefer gpsbt over liblocation as we got complaints regarding liblocation
3776    # stability    # stability
3777  #  PKG_CHECK_EXISTS(gpsbt, [    if test -n "$PKG_CONFIG" && \
3778  #    PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3779  #    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3780  #    LIBS="$LIBS $gpsbt_LIBS"    ac_status=$?
3781  #  ], [    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3782      (exit $ac_status); }; then
3783    
3784    
3785    pkg_failed=no
3786    { echo "$as_me:$LINENO: checking for gpsbt" >&5
3787    echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }
3788    
3789    if test -n "$PKG_CONFIG"; then
3790        if test -n "$gpsbt_CFLAGS"; then
3791            pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"
3792        else
3793            if test -n "$PKG_CONFIG" && \
3794        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3795      ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3796      ac_status=$?
3797      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3798      (exit $ac_status); }; then
3799      pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
3800    else
3801      pkg_failed=yes
3802    fi
3803        fi
3804    else
3805            pkg_failed=untried
3806    fi
3807    if test -n "$PKG_CONFIG"; then
3808        if test -n "$gpsbt_LIBS"; then
3809            pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
3810        else
3811            if test -n "$PKG_CONFIG" && \
3812        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3813      ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3814      ac_status=$?
3815      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3816      (exit $ac_status); }; then
3817      pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
3818    else
3819      pkg_failed=yes
3820    fi
3821        fi
3822    else
3823            pkg_failed=untried
3824    fi
3825    
3826    
3827    
3828    if test $pkg_failed = yes; then
3829    
3830    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3831            _pkg_short_errors_supported=yes
3832    else
3833            _pkg_short_errors_supported=no
3834    fi
3835            if test $_pkg_short_errors_supported = yes; then
3836                    gpsbt_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gpsbt"`
3837            else
3838                    gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`
3839            fi
3840            # Put the nasty error message in config.log where it belongs
3841            echo "$gpsbt_PKG_ERRORS" >&5
3842    
3843            { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
3844    
3845    $gpsbt_PKG_ERRORS
3846    
3847    Consider adjusting the PKG_CONFIG_PATH environment variable if you
3848    installed software in a non-standard prefix.
3849    
3850    Alternatively, you may set the environment variables gpsbt_CFLAGS
3851    and gpsbt_LIBS to avoid the need to call pkg-config.
3852    See the pkg-config man page for more details.
3853    " >&5
3854    echo "$as_me: error: Package requirements (gpsbt) were not met:
3855    
3856    $gpsbt_PKG_ERRORS
3857    
3858    Consider adjusting the PKG_CONFIG_PATH environment variable if you
3859    installed software in a non-standard prefix.
3860    
3861    Alternatively, you may set the environment variables gpsbt_CFLAGS
3862    and gpsbt_LIBS to avoid the need to call pkg-config.
3863    See the pkg-config man page for more details.
3864    " >&2;}
3865       { (exit 1); exit 1; }; }
3866    elif test $pkg_failed = untried; then
3867            { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
3868    is in your PATH or set the PKG_CONFIG environment variable to the full
3869    path to pkg-config.
3870    
3871    Alternatively, you may set the environment variables gpsbt_CFLAGS
3872    and gpsbt_LIBS to avoid the need to call pkg-config.
3873    See the pkg-config man page for more details.
3874    
3875    To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3876    See \`config.log' for more details." >&5
3877    echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
3878    is in your PATH or set the PKG_CONFIG environment variable to the full
3879    path to pkg-config.
3880    
3881    Alternatively, you may set the environment variables gpsbt_CFLAGS
3882    and gpsbt_LIBS to avoid the need to call pkg-config.
3883    See the pkg-config man page for more details.
3884    
3885    To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3886    See \`config.log' for more details." >&2;}
3887       { (exit 1); exit 1; }; }
3888    else
3889            gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
3890            gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
3891            { echo "$as_me:$LINENO: result: yes" >&5
3892    echo "${ECHO_T}yes" >&6; }
3893            :
3894    fi
3895        CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
3896        LIBS="$LIBS $gpsbt_LIBS"
3897    
3898    else
3899    
3900      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
3901  echo "$as_me: gpsbt not found, trying liblocation" >&6;}  echo "$as_me: gpsbt not found, trying liblocation" >&6;}
3902    
# Line 3902  else Line 4027  else
4027  echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}  echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}
4028    
4029  fi  fi
4030  #  ])  
4031    fi
4032    
4033    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
4034      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\"") >&5
# Line 4546  exec 6>&1 Line 4672  exec 6>&1
4672  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4673  # values after options handling.  # values after options handling.
4674  ac_log="  ac_log="
4675  This file was extended by GPXView $as_me 0.7.0, which was  This file was extended by GPXView $as_me 0.7.1, which was
4676  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4677    
4678    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4589  Report bugs to <bug-autoconf@gnu.org>." Line 4715  Report bugs to <bug-autoconf@gnu.org>."
4715  _ACEOF  _ACEOF
4716  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4717  ac_cs_version="\\  ac_cs_version="\\
4718  GPXView config.status 0.7.0  GPXView config.status 0.7.1
4719  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4720    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4721    
# Line 4820  sqlite3_CFLAGS!$sqlite3_CFLAGS$ac_delim Line 4946  sqlite3_CFLAGS!$sqlite3_CFLAGS$ac_delim
4946  sqlite3_LIBS!$sqlite3_LIBS$ac_delim  sqlite3_LIBS!$sqlite3_LIBS$ac_delim
4947  hildon_help_CFLAGS!$hildon_help_CFLAGS$ac_delim  hildon_help_CFLAGS!$hildon_help_CFLAGS$ac_delim
4948  hildon_help_LIBS!$hildon_help_LIBS$ac_delim  hildon_help_LIBS!$hildon_help_LIBS$ac_delim
4949    gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
4950    gpsbt_LIBS!$gpsbt_LIBS$ac_delim
4951  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
4952  liblocation_LIBS!$liblocation_LIBS$ac_delim  liblocation_LIBS!$liblocation_LIBS$ac_delim
4953  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
# Line 4832  LIBOBJS!$LIBOBJS$ac_delim Line 4960  LIBOBJS!$LIBOBJS$ac_delim
4960  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
4961  _ACEOF  _ACEOF
4962    
4963    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
4964      break      break
4965    elif $ac_last_try; then    elif $ac_last_try; then
4966      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Legend:
Removed from v.20  
changed lines
  Added in v.21