Diff of /trunk/configure

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

revision 280 by harbaum, Fri May 21 19:28:16 2010 UTC revision 299 by harbaum, Fri Aug 27 12:04:34 2010 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.65 for GPXView 0.9.4.  # Generated by GNU Autoconf 2.65 for GPXView 0.9.6.
4  #  #
5  # Report bugs to <till@harbaum.org>.  # Report bugs to <till@harbaum.org>.
6  #  #
# Line 552  MAKEFLAGS= Line 552  MAKEFLAGS=
552  # Identity of this package.  # Identity of this package.
553  PACKAGE_NAME='GPXView'  PACKAGE_NAME='GPXView'
554  PACKAGE_TARNAME='gpxview'  PACKAGE_TARNAME='gpxview'
555  PACKAGE_VERSION='0.9.4'  PACKAGE_VERSION='0.9.6'
556  PACKAGE_STRING='GPXView 0.9.4'  PACKAGE_STRING='GPXView 0.9.6'
557  PACKAGE_BUGREPORT='till@harbaum.org'  PACKAGE_BUGREPORT='till@harbaum.org'
558  PACKAGE_URL=''  PACKAGE_URL=''
559    
# Line 599  LIBOBJS Line 599  LIBOBJS
599  INSTALL_PLATTFORM  INSTALL_PLATTFORM
600  ICON  ICON
601  EXTRA_OBJS  EXTRA_OBJS
602    gps_LIBS
603    gps_CFLAGS
604  gnome2_LIBS  gnome2_LIBS
605  gnome2_CFLAGS  gnome2_CFLAGS
606  gtk_LIBS  gtk_LIBS
# Line 732  CPP Line 734  CPP
734  gtk_CFLAGS  gtk_CFLAGS
735  gtk_LIBS  gtk_LIBS
736  gnome2_CFLAGS  gnome2_CFLAGS
737  gnome2_LIBS'  gnome2_LIBS
738    gps_CFLAGS
739    gps_LIBS'
740    
741    
742  # Initialize some variables set by options.  # Initialize some variables set by options.
# Line 1274  if test "$ac_init_help" = "long"; then Line 1278  if test "$ac_init_help" = "long"; then
1278    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1279    # 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.
1280    cat <<_ACEOF    cat <<_ACEOF
1281  \`configure' configures GPXView 0.9.4 to adapt to many kinds of systems.  \`configure' configures GPXView 0.9.6 to adapt to many kinds of systems.
1282    
1283  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1284    
# Line 1335  fi Line 1339  fi
1339    
1340  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1341    case $ac_init_help in    case $ac_init_help in
1342       short | recursive ) echo "Configuration of GPXView 0.9.4:";;       short | recursive ) echo "Configuration of GPXView 0.9.6:";;
1343     esac     esac
1344    cat <<\_ACEOF    cat <<\_ACEOF
1345    
# Line 1406  Some influential environment variables: Line 1410  Some influential environment variables:
1410    gnome2_CFLAGS    gnome2_CFLAGS
1411                C compiler flags for gnome2, overriding pkg-config                C compiler flags for gnome2, overriding pkg-config
1412    gnome2_LIBS linker flags for gnome2, overriding pkg-config    gnome2_LIBS linker flags for gnome2, overriding pkg-config
1413      gps_CFLAGS  C compiler flags for gps, overriding pkg-config
1414      gps_LIBS    linker flags for gps, overriding pkg-config
1415    
1416  Use these variables to override the choices made by `configure' or to help  Use these variables to override the choices made by `configure' or to help
1417  it to find libraries and programs with nonstandard names/locations.  it to find libraries and programs with nonstandard names/locations.
# Line 1473  fi Line 1479  fi
1479  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1480  if $ac_init_version; then  if $ac_init_version; then
1481    cat <<\_ACEOF    cat <<\_ACEOF
1482  GPXView configure 0.9.4  GPXView configure 0.9.6
1483  generated by GNU Autoconf 2.65  generated by GNU Autoconf 2.65
1484    
1485  Copyright (C) 2009 Free Software Foundation, Inc.  Copyright (C) 2009 Free Software Foundation, Inc.
# Line 1731  cat >config.log <<_ACEOF Line 1737  cat >config.log <<_ACEOF
1737  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1738  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1739    
1740  It was created by GPXView $as_me 0.9.4, which was  It was created by GPXView $as_me 0.9.6, which was
1741  generated by GNU Autoconf 2.65.  Invocation command line was  generated by GNU Autoconf 2.65.  Invocation command line was
1742    
1743    $ $0 $@    $ $0 $@
# Line 5135  fi Line 5141  fi
5141  done  done
5142    
5143    
5144      # check for libgps
5145    
5146    pkg_failed=no
5147    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gps" >&5
5148    $as_echo_n "checking for gps... " >&6; }
5149    
5150    if test -n "$PKG_CONFIG"; then
5151        if test -n "$gps_CFLAGS"; then
5152            pkg_cv_gps_CFLAGS="$gps_CFLAGS"
5153        else
5154            if test -n "$PKG_CONFIG" && \
5155        { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgps\""; } >&5
5156      ($PKG_CONFIG --exists --print-errors "libgps") 2>&5
5157      ac_status=$?
5158      $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5159      test $ac_status = 0; }; then
5160      pkg_cv_gps_CFLAGS=`$PKG_CONFIG --cflags "libgps" 2>/dev/null`
5161    else
5162      pkg_failed=yes
5163    fi
5164        fi
5165    else
5166            pkg_failed=untried
5167    fi
5168    if test -n "$PKG_CONFIG"; then
5169        if test -n "$gps_LIBS"; then
5170            pkg_cv_gps_LIBS="$gps_LIBS"
5171        else
5172            if test -n "$PKG_CONFIG" && \
5173        { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgps\""; } >&5
5174      ($PKG_CONFIG --exists --print-errors "libgps") 2>&5
5175      ac_status=$?
5176      $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5177      test $ac_status = 0; }; then
5178      pkg_cv_gps_LIBS=`$PKG_CONFIG --libs "libgps" 2>/dev/null`
5179    else
5180      pkg_failed=yes
5181    fi
5182        fi
5183    else
5184            pkg_failed=untried
5185    fi
5186    
5187    
5188    
5189    if test $pkg_failed = yes; then
5190    
5191    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
5192            _pkg_short_errors_supported=yes
5193    else
5194            _pkg_short_errors_supported=no
5195    fi
5196            if test $_pkg_short_errors_supported = yes; then
5197                    gps_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgps"`
5198            else
5199                    gps_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgps"`
5200            fi
5201            # Put the nasty error message in config.log where it belongs
5202            echo "$gps_PKG_ERRORS" >&5
5203    
5204            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5205    $as_echo "no" >&6; }
5206                    { $as_echo "$as_me:${as_lineno-$LINENO}: No libgps found, using direct GPSD" >&5
5207    $as_echo "$as_me: No libgps found, using direct GPSD" >&6;}
5208    elif test $pkg_failed = untried; then
5209            { $as_echo "$as_me:${as_lineno-$LINENO}: No libgps found, using direct GPSD" >&5
5210    $as_echo "$as_me: No libgps found, using direct GPSD" >&6;}
5211    else
5212            gps_CFLAGS=$pkg_cv_gps_CFLAGS
5213            gps_LIBS=$pkg_cv_gps_LIBS
5214            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5215    $as_echo "yes" >&6; }
5216    
5217        CFLAGS="$CFLAGS $gps_CFLAGS -DUSE_LIBGPS"
5218        LIBS="$LIBS $gps_LIBS"
5219    
5220    fi
5221    
5222    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
5223    
5224    ICON=" No icon"    ICON=" No icon"
# Line 5688  cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri Line 5772  cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
5772  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
5773  # values after options handling.  # values after options handling.
5774  ac_log="  ac_log="
5775  This file was extended by GPXView $as_me 0.9.4, which was  This file was extended by GPXView $as_me 0.9.6, which was
5776  generated by GNU Autoconf 2.65.  Invocation command line was  generated by GNU Autoconf 2.65.  Invocation command line was
5777    
5778    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 5741  _ACEOF Line 5825  _ACEOF
5825  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
5826  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
5827  ac_cs_version="\\  ac_cs_version="\\
5828  GPXView config.status 0.9.4  GPXView config.status 0.9.6
5829  configured by $0, generated by GNU Autoconf 2.65,  configured by $0, generated by GNU Autoconf 2.65,
5830    with options \\"\$ac_cs_config\\"    with options \\"\$ac_cs_config\\"
5831    
Legend:
Removed from v.280  
changed lines
  Added in v.299