Diff of /trunk/configure

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

revision 117 by harbaum, Thu Sep 17 07:33:13 2009 UTC revision 233 by harbaum, Wed Dec 9 19:45:36 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.8.10.  # Generated by GNU Autoconf 2.61 for GPXView 0.9.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.8.10'  PACKAGE_VERSION='0.9.0'
578  PACKAGE_STRING='GPXView 0.8.10'  PACKAGE_STRING='GPXView 0.9.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 634  gnome_vfs_module_CFLAGS Line 634  gnome_vfs_module_CFLAGS
634  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
635  libxml2_CFLAGS  libxml2_CFLAGS
636  libxml2_LIBS  libxml2_LIBS
637    libcurl_CFLAGS
638    libcurl_LIBS
639  libsoup24_CFLAGS  libsoup24_CFLAGS
640  libsoup24_LIBS  libsoup24_LIBS
641  libsoup22_CFLAGS  libsoup22_CFLAGS
# Line 656  gpsbt_CFLAGS Line 658  gpsbt_CFLAGS
658  gpsbt_LIBS  gpsbt_LIBS
659  liblocation_CFLAGS  liblocation_CFLAGS
660  liblocation_LIBS  liblocation_LIBS
661    MAEMO_VERSION_MAJOR
662  gtk_CFLAGS  gtk_CFLAGS
663  gtk_LIBS  gtk_LIBS
664  gnome2_CFLAGS  gnome2_CFLAGS
# Line 679  gnome_vfs_module_CFLAGS Line 682  gnome_vfs_module_CFLAGS
682  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
683  libxml2_CFLAGS  libxml2_CFLAGS
684  libxml2_LIBS  libxml2_LIBS
685    libcurl_CFLAGS
686    libcurl_LIBS
687  libsoup24_CFLAGS  libsoup24_CFLAGS
688  libsoup24_LIBS  libsoup24_LIBS
689  libsoup22_CFLAGS  libsoup22_CFLAGS
# Line 1207  if test "$ac_init_help" = "long"; then Line 1212  if test "$ac_init_help" = "long"; then
1212    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1213    # 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.
1214    cat <<_ACEOF    cat <<_ACEOF
1215  \`configure' configures GPXView 0.8.10 to adapt to many kinds of systems.  \`configure' configures GPXView 0.9.0 to adapt to many kinds of systems.
1216    
1217  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1218    
# Line 1268  fi Line 1273  fi
1273    
1274  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1275    case $ac_init_help in    case $ac_init_help in
1276       short | recursive ) echo "Configuration of GPXView 0.8.10:";;       short | recursive ) echo "Configuration of GPXView 0.9.0:";;
1277     esac     esac
1278    cat <<\_ACEOF    cat <<\_ACEOF
1279    
# Line 1289  Some influential environment variables: Line 1294  Some influential environment variables:
1294                C compiler flags for libxml2, overriding pkg-config                C compiler flags for libxml2, overriding pkg-config
1295    libxml2_LIBS    libxml2_LIBS
1296                linker flags for libxml2, overriding pkg-config                linker flags for libxml2, overriding pkg-config
1297      libcurl_CFLAGS
1298                  C compiler flags for libcurl, overriding pkg-config
1299      libcurl_LIBS
1300                  linker flags for libcurl, overriding pkg-config
1301    libsoup24_CFLAGS    libsoup24_CFLAGS
1302                C compiler flags for libsoup24, overriding pkg-config                C compiler flags for libsoup24, overriding pkg-config
1303    libsoup24_LIBS    libsoup24_LIBS
# Line 1399  fi Line 1408  fi
1408  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1409  if $ac_init_version; then  if $ac_init_version; then
1410    cat <<\_ACEOF    cat <<\_ACEOF
1411  GPXView configure 0.8.10  GPXView configure 0.9.0
1412  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1413    
1414  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1413  cat >config.log <<_ACEOF Line 1422  cat >config.log <<_ACEOF
1422  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1423  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1424    
1425  It was created by GPXView $as_me 0.8.10, which was  It was created by GPXView $as_me 0.9.0, which was
1426  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1427    
1428    $ $0 $@    $ $0 $@
# Line 3143  echo "${ECHO_T}yes" >&6; } Line 3152  echo "${ECHO_T}yes" >&6; }
3152  fi  fi
3153  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
3154  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
3155    
3156    # check for libcurl
3157    
3158    pkg_failed=no
3159    { echo "$as_me:$LINENO: checking for libcurl" >&5
3160    echo $ECHO_N "checking for libcurl... $ECHO_C" >&6; }
3161    
3162    if test -n "$PKG_CONFIG"; then
3163        if test -n "$libcurl_CFLAGS"; then
3164            pkg_cv_libcurl_CFLAGS="$libcurl_CFLAGS"
3165        else
3166            if test -n "$PKG_CONFIG" && \
3167        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
3168      ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
3169      ac_status=$?
3170      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3171      (exit $ac_status); }; then
3172      pkg_cv_libcurl_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
3173    else
3174      pkg_failed=yes
3175    fi
3176        fi
3177    else
3178            pkg_failed=untried
3179    fi
3180    if test -n "$PKG_CONFIG"; then
3181        if test -n "$libcurl_LIBS"; then
3182            pkg_cv_libcurl_LIBS="$libcurl_LIBS"
3183        else
3184            if test -n "$PKG_CONFIG" && \
3185        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl\"") >&5
3186      ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
3187      ac_status=$?
3188      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3189      (exit $ac_status); }; then
3190      pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
3191    else
3192      pkg_failed=yes
3193    fi
3194        fi
3195    else
3196            pkg_failed=untried
3197    fi
3198    
3199    
3200    
3201    if test $pkg_failed = yes; then
3202    
3203    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3204            _pkg_short_errors_supported=yes
3205    else
3206            _pkg_short_errors_supported=no
3207    fi
3208            if test $_pkg_short_errors_supported = yes; then
3209                    libcurl_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"`
3210            else
3211                    libcurl_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"`
3212            fi
3213            # Put the nasty error message in config.log where it belongs
3214            echo "$libcurl_PKG_ERRORS" >&5
3215    
3216            { echo "$as_me:$LINENO: result: no" >&5
3217    echo "${ECHO_T}no" >&6; }
3218                    { { echo "$as_me:$LINENO: error: libcurl missing" >&5
3219    echo "$as_me: error: libcurl missing" >&2;}
3220       { (exit 1); exit 1; }; }
3221    elif test $pkg_failed = untried; then
3222            { { echo "$as_me:$LINENO: error: libcurl missing" >&5
3223    echo "$as_me: error: libcurl missing" >&2;}
3224       { (exit 1); exit 1; }; }
3225    else
3226            libcurl_CFLAGS=$pkg_cv_libcurl_CFLAGS
3227            libcurl_LIBS=$pkg_cv_libcurl_LIBS
3228            { echo "$as_me:$LINENO: result: yes" >&5
3229    echo "${ECHO_T}yes" >&6; }
3230            :
3231    fi
3232    CFLAGS="$CFLAGS $libcurl_CFLAGS"
3233    LIBS="$LIBS $libcurl_LIBS"
3234    
3235  # check for libsoup  # check for libsoup
3236    
3237  pkg_failed=no  pkg_failed=no
# Line 4315  echo "$as_me: Configuring for Maemo $VER Line 4404  echo "$as_me: Configuring for Maemo $VER
4404      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
4405      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
4406    
4407        MAEMO_VERSION_MAJOR=$MAJOR
4408    
4409    
4410  else  else
4411    
4412      { { echo "$as_me:$LINENO: error: maemo-version not found" >&5      { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
# Line 4323  echo "$as_me: error: maemo-version not f Line 4415  echo "$as_me: error: maemo-version not f
4415    
4416  fi  fi
4417    
   # maemo uses dbus for ipc with maemo mapper  
   EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"  
   
4418    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
4419    
4420    # fremantle uses icons of 48x48 pixels for the app installer    # fremantle uses icons of 48x48 pixels for the app installer,
4421      # older versions used 26x26
4422    if [ "$MAJOR" == "5" ]; then    if [ "$MAJOR" == "5" ]; then
4423       ICONNAME=gpxview.48.png       ICONNAME=48x48/gpxview.png
4424         datarootdir=/opt
4425    else    else
4426       ICONNAME=gpxview.26.png       ICONNAME=26x26/gpxview.png
4427         { echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
4428    echo "$as_me: Enabling Maemo Mapper support" >&6;}
4429    fi    fi
4430    
4431      CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
4432      EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
4433    
4434      # maemo uses dbus for ipc with maemo mapper
4435      EXTRA_OBJS="$EXTRA_OBJS dbus.o"
4436    
4437    { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5    { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
4438  echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}  echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
4439    
# Line 4345  XB-Maemo-Icon-26: Line 4444  XB-Maemo-Icon-26:
4444    
4445    # generate base64 icon, remove first and last line    # generate base64 icon, remove first and last line
4446    # and add a space before each line    # and add a space before each line
4447    ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"    ICON="$ICON`uuencode -m data/icons/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
4448    
4449    
4450  else  else
# Line 4353  else Line 4452  else
4452    { echo "$as_me:$LINENO: result: no" >&5    { echo "$as_me:$LINENO: result: no" >&5
4453  echo "${ECHO_T}no" >&6; }  echo "${ECHO_T}no" >&6; }
4454    
4455      EXTRA_OBJS="$EXTRA_OBJS bct.o"
4456      CFLAGS="$CFLAGS -DBCT"
4457    
4458    # check for gtk+-2.0    # check for gtk+-2.0
4459    
4460  pkg_failed=no  pkg_failed=no
# Line 4949  exec 6>&1 Line 5051  exec 6>&1
5051  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
5052  # values after options handling.  # values after options handling.
5053  ac_log="  ac_log="
5054  This file was extended by GPXView $as_me 0.8.10, which was  This file was extended by GPXView $as_me 0.9.0, which was
5055  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
5056    
5057    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4992  Report bugs to <bug-autoconf@gnu.org>." Line 5094  Report bugs to <bug-autoconf@gnu.org>."
5094  _ACEOF  _ACEOF
5095  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
5096  ac_cs_version="\\  ac_cs_version="\\
5097  GPXView config.status 0.8.10  GPXView config.status 0.9.0
5098  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
5099    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
5100    
# Line 5210  gnome_vfs_module_CFLAGS!$gnome_vfs_modul Line 5312  gnome_vfs_module_CFLAGS!$gnome_vfs_modul
5312  gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim  gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim
5313  libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim  libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim
5314  libxml2_LIBS!$libxml2_LIBS$ac_delim  libxml2_LIBS!$libxml2_LIBS$ac_delim
5315    libcurl_CFLAGS!$libcurl_CFLAGS$ac_delim
5316    libcurl_LIBS!$libcurl_LIBS$ac_delim
5317  libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim  libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim
5318  libsoup24_LIBS!$libsoup24_LIBS$ac_delim  libsoup24_LIBS!$libsoup24_LIBS$ac_delim
5319  libsoup22_CFLAGS!$libsoup22_CFLAGS$ac_delim  libsoup22_CFLAGS!$libsoup22_CFLAGS$ac_delim
# Line 5232  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim Line 5336  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
5336  gpsbt_LIBS!$gpsbt_LIBS$ac_delim  gpsbt_LIBS!$gpsbt_LIBS$ac_delim
5337  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
5338  liblocation_LIBS!$liblocation_LIBS$ac_delim  liblocation_LIBS!$liblocation_LIBS$ac_delim
5339    MAEMO_VERSION_MAJOR!$MAEMO_VERSION_MAJOR$ac_delim
5340  gtk_CFLAGS!$gtk_CFLAGS$ac_delim  gtk_CFLAGS!$gtk_CFLAGS$ac_delim
5341  gtk_LIBS!$gtk_LIBS$ac_delim  gtk_LIBS!$gtk_LIBS$ac_delim
5342  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
# Line 5243  LIBOBJS!$LIBOBJS$ac_delim Line 5348  LIBOBJS!$LIBOBJS$ac_delim
5348  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
5349  _ACEOF  _ACEOF
5350    
5351    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
5352      break      break
5353    elif $ac_last_try; then    elif $ac_last_try; then
5354      { { 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.117  
changed lines
  Added in v.233