Diff of /trunk/configure

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

revision 118 by harbaum, Thu Sep 17 18:50:24 2009 UTC revision 157 by harbaum, Tue Nov 3 20:20:39 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.63 for GPXView 0.8.9.  # Generated by GNU Autoconf 2.63 for GPXView 0.8.12.
4  #  #
5  # Report bugs to <till@harbaum.org>.  # Report bugs to <till@harbaum.org>.
6  #  #
# Line 596  SHELL=${CONFIG_SHELL-/bin/sh} Line 596  SHELL=${CONFIG_SHELL-/bin/sh}
596  # Identity of this package.  # Identity of this package.
597  PACKAGE_NAME='GPXView'  PACKAGE_NAME='GPXView'
598  PACKAGE_TARNAME='gpxview'  PACKAGE_TARNAME='gpxview'
599  PACKAGE_VERSION='0.8.9'  PACKAGE_VERSION='0.8.12'
600  PACKAGE_STRING='GPXView 0.8.9'  PACKAGE_STRING='GPXView 0.8.12'
601  PACKAGE_BUGREPORT='till@harbaum.org'  PACKAGE_BUGREPORT='till@harbaum.org'
602    
603  ac_unique_file="src/main.c"  ac_unique_file="src/main.c"
# Line 610  gnome2_LIBS Line 610  gnome2_LIBS
610  gnome2_CFLAGS  gnome2_CFLAGS
611  gtk_LIBS  gtk_LIBS
612  gtk_CFLAGS  gtk_CFLAGS
613    MAEMO_VERSION_MAJOR
614  liblocation_LIBS  liblocation_LIBS
615  liblocation_CFLAGS  liblocation_CFLAGS
616  gpsbt_LIBS  gpsbt_LIBS
# Line 632  libsoup22_LIBS Line 633  libsoup22_LIBS
633  libsoup22_CFLAGS  libsoup22_CFLAGS
634  libsoup24_LIBS  libsoup24_LIBS
635  libsoup24_CFLAGS  libsoup24_CFLAGS
636    libcurl_LIBS
637    libcurl_CFLAGS
638  libxml2_LIBS  libxml2_LIBS
639  libxml2_CFLAGS  libxml2_CFLAGS
640  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
# Line 704  gnome_vfs_module_CFLAGS Line 707  gnome_vfs_module_CFLAGS
707  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
708  libxml2_CFLAGS  libxml2_CFLAGS
709  libxml2_LIBS  libxml2_LIBS
710    libcurl_CFLAGS
711    libcurl_LIBS
712  libsoup24_CFLAGS  libsoup24_CFLAGS
713  libsoup24_LIBS  libsoup24_LIBS
714  libsoup22_CFLAGS  libsoup22_CFLAGS
# Line 1282  if test "$ac_init_help" = "long"; then Line 1287  if test "$ac_init_help" = "long"; then
1287    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1288    # 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.
1289    cat <<_ACEOF    cat <<_ACEOF
1290  \`configure' configures GPXView 0.8.9 to adapt to many kinds of systems.  \`configure' configures GPXView 0.8.12 to adapt to many kinds of systems.
1291    
1292  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1293    
# Line 1343  fi Line 1348  fi
1348    
1349  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1350    case $ac_init_help in    case $ac_init_help in
1351       short | recursive ) echo "Configuration of GPXView 0.8.9:";;       short | recursive ) echo "Configuration of GPXView 0.8.12:";;
1352     esac     esac
1353    cat <<\_ACEOF    cat <<\_ACEOF
1354    
# Line 1364  Some influential environment variables: Line 1369  Some influential environment variables:
1369                C compiler flags for libxml2, overriding pkg-config                C compiler flags for libxml2, overriding pkg-config
1370    libxml2_LIBS    libxml2_LIBS
1371                linker flags for libxml2, overriding pkg-config                linker flags for libxml2, overriding pkg-config
1372      libcurl_CFLAGS
1373                  C compiler flags for libcurl, overriding pkg-config
1374      libcurl_LIBS
1375                  linker flags for libcurl, overriding pkg-config
1376    libsoup24_CFLAGS    libsoup24_CFLAGS
1377                C compiler flags for libsoup24, overriding pkg-config                C compiler flags for libsoup24, overriding pkg-config
1378    libsoup24_LIBS    libsoup24_LIBS
# Line 1476  fi Line 1485  fi
1485  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1486  if $ac_init_version; then  if $ac_init_version; then
1487    cat <<\_ACEOF    cat <<\_ACEOF
1488  GPXView configure 0.8.9  GPXView configure 0.8.12
1489  generated by GNU Autoconf 2.63  generated by GNU Autoconf 2.63
1490    
1491  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1490  cat >config.log <<_ACEOF Line 1499  cat >config.log <<_ACEOF
1499  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1500  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1501    
1502  It was created by GPXView $as_me 0.8.9, which was  It was created by GPXView $as_me 0.8.12, which was
1503  generated by GNU Autoconf 2.63.  Invocation command line was  generated by GNU Autoconf 2.63.  Invocation command line was
1504    
1505    $ $0 $@    $ $0 $@
# Line 3259  $as_echo "yes" >&6; } Line 3268  $as_echo "yes" >&6; }
3268  fi  fi
3269  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
3270  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
3271    
3272    # check for libcurl
3273    
3274    pkg_failed=no
3275    { $as_echo "$as_me:$LINENO: checking for libcurl" >&5
3276    $as_echo_n "checking for libcurl... " >&6; }
3277    
3278    if test -n "$PKG_CONFIG"; then
3279        if test -n "$libcurl_CFLAGS"; then
3280            pkg_cv_libcurl_CFLAGS="$libcurl_CFLAGS"
3281        else
3282            if test -n "$PKG_CONFIG" && \
3283        { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
3284      ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
3285      ac_status=$?
3286      $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3287      (exit $ac_status); }; then
3288      pkg_cv_libcurl_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
3289    else
3290      pkg_failed=yes
3291    fi
3292        fi
3293    else
3294            pkg_failed=untried
3295    fi
3296    if test -n "$PKG_CONFIG"; then
3297        if test -n "$libcurl_LIBS"; then
3298            pkg_cv_libcurl_LIBS="$libcurl_LIBS"
3299        else
3300            if test -n "$PKG_CONFIG" && \
3301        { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
3302      ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
3303      ac_status=$?
3304      $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3305      (exit $ac_status); }; then
3306      pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
3307    else
3308      pkg_failed=yes
3309    fi
3310        fi
3311    else
3312            pkg_failed=untried
3313    fi
3314    
3315    
3316    
3317    if test $pkg_failed = yes; then
3318    
3319    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3320            _pkg_short_errors_supported=yes
3321    else
3322            _pkg_short_errors_supported=no
3323    fi
3324            if test $_pkg_short_errors_supported = yes; then
3325                    libcurl_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"`
3326            else
3327                    libcurl_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"`
3328            fi
3329            # Put the nasty error message in config.log where it belongs
3330            echo "$libcurl_PKG_ERRORS" >&5
3331    
3332            { $as_echo "$as_me:$LINENO: result: no" >&5
3333    $as_echo "no" >&6; }
3334                    { { $as_echo "$as_me:$LINENO: error: libcurl missing" >&5
3335    $as_echo "$as_me: error: libcurl missing" >&2;}
3336       { (exit 1); exit 1; }; }
3337    elif test $pkg_failed = untried; then
3338            { { $as_echo "$as_me:$LINENO: error: libcurl missing" >&5
3339    $as_echo "$as_me: error: libcurl missing" >&2;}
3340       { (exit 1); exit 1; }; }
3341    else
3342            libcurl_CFLAGS=$pkg_cv_libcurl_CFLAGS
3343            libcurl_LIBS=$pkg_cv_libcurl_LIBS
3344            { $as_echo "$as_me:$LINENO: result: yes" >&5
3345    $as_echo "yes" >&6; }
3346            :
3347    fi
3348    CFLAGS="$CFLAGS $libcurl_CFLAGS"
3349    LIBS="$LIBS $libcurl_LIBS"
3350    
3351  # check for libsoup  # check for libsoup
3352    
3353  pkg_failed=no  pkg_failed=no
# Line 4435  $as_echo "$as_me: Configuring for Maemo Line 4524  $as_echo "$as_me: Configuring for Maemo
4524      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
4525      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
4526    
4527        MAEMO_VERSION_MAJOR=$MAJOR
4528    
4529    
4530  else  else
4531    
4532      { { $as_echo "$as_me:$LINENO: error: maemo-version not found" >&5      { { $as_echo "$as_me:$LINENO: error: maemo-version not found" >&5
# Line 4443  $as_echo "$as_me: error: maemo-version n Line 4535  $as_echo "$as_me: error: maemo-version n
4535    
4536  fi  fi
4537    
   # maemo uses dbus for ipc with maemo mapper  
   EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"  
   
4538    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
4539    
4540    # fremantle uses icons of 48x48 pixels for the app installer,    # fremantle uses icons of 48x48 pixels for the app installer,
4541    # older versions used 26x26    # older versions used 26x26
4542    if [ "$MAJOR" == "5" ]; then    if [ "$MAJOR" == "5" ]; then
4543       ICONNAME=gpxview.48.png       ICONNAME=gpxview.48.png
4544         datarootdir=/opt
4545    else    else
4546       ICONNAME=gpxview.26.png       ICONNAME=gpxview.26.png
4547         { $as_echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
4548    $as_echo "$as_me: Enabling Maemo Mapper support" >&6;}
4549         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
4550         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
4551    fi    fi
4552    
4553      # maemo uses dbus for ipc with maemo mapper
4554      EXTRA_OBJS="$EXTRA_OBJS dbus.o"
4555    
4556    { $as_echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5    { $as_echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
4557  $as_echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}  $as_echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
4558    
# Line 4474  else Line 4571  else
4571    { $as_echo "$as_me:$LINENO: result: no" >&5    { $as_echo "$as_me:$LINENO: result: no" >&5
4572  $as_echo "no" >&6; }  $as_echo "no" >&6; }
4573    
4574      EXTRA_OBJS="$EXTRA_OBJS bct.o"
4575      CFLAGS="$CFLAGS -DBCT"
4576    
4577    # check for gtk+-2.0    # check for gtk+-2.0
4578    
4579  pkg_failed=no  pkg_failed=no
# Line 5099  exec 6>&1 Line 5199  exec 6>&1
5199  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
5200  # values after options handling.  # values after options handling.
5201  ac_log="  ac_log="
5202  This file was extended by GPXView $as_me 0.8.9, which was  This file was extended by GPXView $as_me 0.8.12, which was
5203  generated by GNU Autoconf 2.63.  Invocation command line was  generated by GNU Autoconf 2.63.  Invocation command line was
5204    
5205    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 5149  Report bugs to <bug-autoconf@gnu.org>." Line 5249  Report bugs to <bug-autoconf@gnu.org>."
5249  _ACEOF  _ACEOF
5250  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
5251  ac_cs_version="\\  ac_cs_version="\\
5252  GPXView config.status 0.8.9  GPXView config.status 0.8.12
5253  configured by $0, generated by GNU Autoconf 2.63,  configured by $0, generated by GNU Autoconf 2.63,
5254    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
5255    
Legend:
Removed from v.118  
changed lines
  Added in v.157