Diff of /trunk/configure

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

revision 7 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 8 by harbaum, Thu Jun 25 19:08:48 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.6.10.  # Generated by GNU Autoconf 2.61 for GPXView 0.7.0.
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.6.10'  PACKAGE_VERSION='0.7.0'
578  PACKAGE_STRING='GPXView 0.6.10'  PACKAGE_STRING='GPXView 0.7.0'
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
 gpsbt_CFLAGS  
 gpsbt_LIBS  
651  liblocation_CFLAGS  liblocation_CFLAGS
652  liblocation_LIBS  liblocation_LIBS
653  EXTRA_OBJS  EXTRA_OBJS
# Line 688  sqlite3_CFLAGS Line 686  sqlite3_CFLAGS
686  sqlite3_LIBS  sqlite3_LIBS
687  hildon_help_CFLAGS  hildon_help_CFLAGS
688  hildon_help_LIBS  hildon_help_LIBS
 gpsbt_CFLAGS  
 gpsbt_LIBS  
689  liblocation_CFLAGS  liblocation_CFLAGS
690  liblocation_LIBS  liblocation_LIBS
691  gtk_CFLAGS  gtk_CFLAGS
# Line 1198  if test "$ac_init_help" = "long"; then Line 1194  if test "$ac_init_help" = "long"; then
1194    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1195    # 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.
1196    cat <<_ACEOF    cat <<_ACEOF
1197  \`configure' configures GPXView 0.6.10 to adapt to many kinds of systems.  \`configure' configures GPXView 0.7.0 to adapt to many kinds of systems.
1198    
1199  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1200    
# Line 1259  fi Line 1255  fi
1255    
1256  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1257    case $ac_init_help in    case $ac_init_help in
1258       short | recursive ) echo "Configuration of GPXView 0.6.10:";;       short | recursive ) echo "Configuration of GPXView 0.7.0:";;
1259     esac     esac
1260    cat <<\_ACEOF    cat <<\_ACEOF
1261    
# Line 1305  Some influential environment variables: Line 1301  Some influential environment variables:
1301                C compiler flags for hildon_help, overriding pkg-config                C compiler flags for hildon_help, overriding pkg-config
1302    hildon_help_LIBS    hildon_help_LIBS
1303                linker flags for hildon_help, overriding pkg-config                linker flags for hildon_help, overriding pkg-config
   gpsbt_CFLAGS  
               C compiler flags for gpsbt, overriding pkg-config  
   gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config  
1304    liblocation_CFLAGS    liblocation_CFLAGS
1305                C compiler flags for liblocation, overriding pkg-config                C compiler flags for liblocation, overriding pkg-config
1306    liblocation_LIBS    liblocation_LIBS
# Line 1382  fi Line 1375  fi
1375  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1376  if $ac_init_version; then  if $ac_init_version; then
1377    cat <<\_ACEOF    cat <<\_ACEOF
1378  GPXView configure 0.6.10  GPXView configure 0.7.0
1379  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1380    
1381  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1396  cat >config.log <<_ACEOF Line 1389  cat >config.log <<_ACEOF
1389  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1390  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1391    
1392  It was created by GPXView $as_me 0.6.10, which was  It was created by GPXView $as_me 0.7.0, which was
1393  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1394    
1395    $ $0 $@    $ $0 $@
# Line 3774  fi Line 3767  fi
3767    
3768    # prefer gpsbt over liblocation as we got complaints regarding liblocation    # prefer gpsbt over liblocation as we got complaints regarding liblocation
3769    # stability    # stability
3770    if test -n "$PKG_CONFIG" && \  #  PKG_CHECK_EXISTS(gpsbt, [
3771      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5  #    PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
3772    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5  #    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
3773    ac_status=$?  #    LIBS="$LIBS $gpsbt_LIBS"
3774    echo "$as_me:$LINENO: \$? = $ac_status" >&5  #  ], [
   (exit $ac_status); }; then  
   
   
 pkg_failed=no  
 { echo "$as_me:$LINENO: checking for gpsbt" >&5  
 echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }  
   
 if test -n "$PKG_CONFIG"; then  
     if test -n "$gpsbt_CFLAGS"; then  
         pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"  
     else  
         if test -n "$PKG_CONFIG" && \  
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5  
   ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5  
   ac_status=$?  
   echo "$as_me:$LINENO: \$? = $ac_status" >&5  
   (exit $ac_status); }; then  
   pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`  
 else  
   pkg_failed=yes  
 fi  
     fi  
 else  
         pkg_failed=untried  
 fi  
 if test -n "$PKG_CONFIG"; then  
     if test -n "$gpsbt_LIBS"; then  
         pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"  
     else  
         if test -n "$PKG_CONFIG" && \  
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5  
   ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5  
   ac_status=$?  
   echo "$as_me:$LINENO: \$? = $ac_status" >&5  
   (exit $ac_status); }; then  
   pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`  
 else  
   pkg_failed=yes  
 fi  
     fi  
 else  
         pkg_failed=untried  
 fi  
   
   
   
 if test $pkg_failed = yes; then  
   
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then  
         _pkg_short_errors_supported=yes  
 else  
         _pkg_short_errors_supported=no  
 fi  
         if test $_pkg_short_errors_supported = yes; then  
                 gpsbt_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gpsbt"`  
         else  
                 gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`  
         fi  
         # Put the nasty error message in config.log where it belongs  
         echo "$gpsbt_PKG_ERRORS" >&5  
   
         { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:  
   
 $gpsbt_PKG_ERRORS  
   
 Consider adjusting the PKG_CONFIG_PATH environment variable if you  
 installed software in a non-standard prefix.  
   
 Alternatively, you may set the environment variables gpsbt_CFLAGS  
 and gpsbt_LIBS to avoid the need to call pkg-config.  
 See the pkg-config man page for more details.  
 " >&5  
 echo "$as_me: error: Package requirements (gpsbt) were not met:  
   
 $gpsbt_PKG_ERRORS  
   
 Consider adjusting the PKG_CONFIG_PATH environment variable if you  
 installed software in a non-standard prefix.  
   
 Alternatively, you may set the environment variables gpsbt_CFLAGS  
 and gpsbt_LIBS to avoid the need to call pkg-config.  
 See the pkg-config man page for more details.  
 " >&2;}  
    { (exit 1); exit 1; }; }  
 elif test $pkg_failed = untried; then  
         { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it  
 is in your PATH or set the PKG_CONFIG environment variable to the full  
 path to pkg-config.  
   
 Alternatively, you may set the environment variables gpsbt_CFLAGS  
 and gpsbt_LIBS to avoid the need to call pkg-config.  
 See the pkg-config man page for more details.  
   
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.  
 See \`config.log' for more details." >&5  
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it  
 is in your PATH or set the PKG_CONFIG environment variable to the full  
 path to pkg-config.  
   
 Alternatively, you may set the environment variables gpsbt_CFLAGS  
 and gpsbt_LIBS to avoid the need to call pkg-config.  
 See the pkg-config man page for more details.  
   
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.  
 See \`config.log' for more details." >&2;}  
    { (exit 1); exit 1; }; }  
 else  
         gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS  
         gpsbt_LIBS=$pkg_cv_gpsbt_LIBS  
         { echo "$as_me:$LINENO: result: yes" >&5  
 echo "${ECHO_T}yes" >&6; }  
         :  
 fi  
     CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"  
     LIBS="$LIBS $gpsbt_LIBS"  
   
 else  
   
3775      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
3776  echo "$as_me: gpsbt not found, trying liblocation" >&6;}  echo "$as_me: gpsbt not found, trying liblocation" >&6;}
3777    
# Line 4027  else Line 3902  else
3902  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;}
3903    
3904  fi  fi
3905    #  ])
 fi  
3906    
3907    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
3908      { (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 4672  exec 6>&1 Line 4546  exec 6>&1
4546  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4547  # values after options handling.  # values after options handling.
4548  ac_log="  ac_log="
4549  This file was extended by GPXView $as_me 0.6.10, which was  This file was extended by GPXView $as_me 0.7.0, which was
4550  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4551    
4552    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4715  Report bugs to <bug-autoconf@gnu.org>." Line 4589  Report bugs to <bug-autoconf@gnu.org>."
4589  _ACEOF  _ACEOF
4590  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4591  ac_cs_version="\\  ac_cs_version="\\
4592  GPXView config.status 0.6.10  GPXView config.status 0.7.0
4593  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4594    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4595    
# Line 4946  sqlite3_CFLAGS!$sqlite3_CFLAGS$ac_delim Line 4820  sqlite3_CFLAGS!$sqlite3_CFLAGS$ac_delim
4820  sqlite3_LIBS!$sqlite3_LIBS$ac_delim  sqlite3_LIBS!$sqlite3_LIBS$ac_delim
4821  hildon_help_CFLAGS!$hildon_help_CFLAGS$ac_delim  hildon_help_CFLAGS!$hildon_help_CFLAGS$ac_delim
4822  hildon_help_LIBS!$hildon_help_LIBS$ac_delim  hildon_help_LIBS!$hildon_help_LIBS$ac_delim
 gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim  
 gpsbt_LIBS!$gpsbt_LIBS$ac_delim  
4823  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
4824  liblocation_LIBS!$liblocation_LIBS$ac_delim  liblocation_LIBS!$liblocation_LIBS$ac_delim
4825  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
# Line 4960  LIBOBJS!$LIBOBJS$ac_delim Line 4832  LIBOBJS!$LIBOBJS$ac_delim
4832  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
4833  _ACEOF  _ACEOF
4834    
4835    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
4836      break      break
4837    elif $ac_last_try; then    elif $ac_last_try; then
4838      { { 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.7  
changed lines
  Added in v.8