Diff of /trunk/configure

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

revision 30 by harbaum, Fri Jul 24 19:24:42 2009 UTC revision 154 by harbaum, Tue Nov 3 07:36:35 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.4.  # Generated by GNU Autoconf 2.61 for GPXView 0.8.12.
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.4'  PACKAGE_VERSION='0.8.12'
578  PACKAGE_STRING='GPXView 0.7.4'  PACKAGE_STRING='GPXView 0.8.12'
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    libsoup24_CFLAGS
638    libsoup24_LIBS
639    libsoup22_CFLAGS
640    libsoup22_LIBS
641  libgtkhtml3_14_CFLAGS  libgtkhtml3_14_CFLAGS
642  libgtkhtml3_14_LIBS  libgtkhtml3_14_LIBS
643  libgtkhtml3_8_CFLAGS  libgtkhtml3_8_CFLAGS
# Line 652  gpsbt_CFLAGS Line 656  gpsbt_CFLAGS
656  gpsbt_LIBS  gpsbt_LIBS
657  liblocation_CFLAGS  liblocation_CFLAGS
658  liblocation_LIBS  liblocation_LIBS
659  EXTRA_OBJS  MAEMO_VERSION_MAJOR
 INSTALL_PLATTFORM  
660  gtk_CFLAGS  gtk_CFLAGS
661  gtk_LIBS  gtk_LIBS
662  gnome2_CFLAGS  gnome2_CFLAGS
663  gnome2_LIBS  gnome2_LIBS
664    EXTRA_OBJS
665    ICON
666    INSTALL_PLATTFORM
667  LIBOBJS  LIBOBJS
668  LTLIBOBJS'  LTLIBOBJS'
669  ac_subst_files=''  ac_subst_files=''
# Line 674  gnome_vfs_module_CFLAGS Line 680  gnome_vfs_module_CFLAGS
680  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
681  libxml2_CFLAGS  libxml2_CFLAGS
682  libxml2_LIBS  libxml2_LIBS
683    libsoup24_CFLAGS
684    libsoup24_LIBS
685    libsoup22_CFLAGS
686    libsoup22_LIBS
687  libgtkhtml3_14_CFLAGS  libgtkhtml3_14_CFLAGS
688  libgtkhtml3_14_LIBS  libgtkhtml3_14_LIBS
689  libgtkhtml3_8_CFLAGS  libgtkhtml3_8_CFLAGS
# Line 1198  if test "$ac_init_help" = "long"; then Line 1208  if test "$ac_init_help" = "long"; then
1208    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1209    # 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.
1210    cat <<_ACEOF    cat <<_ACEOF
1211  \`configure' configures GPXView 0.7.4 to adapt to many kinds of systems.  \`configure' configures GPXView 0.8.12 to adapt to many kinds of systems.
1212    
1213  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1214    
# Line 1259  fi Line 1269  fi
1269    
1270  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1271    case $ac_init_help in    case $ac_init_help in
1272       short | recursive ) echo "Configuration of GPXView 0.7.4:";;       short | recursive ) echo "Configuration of GPXView 0.8.12:";;
1273     esac     esac
1274    cat <<\_ACEOF    cat <<\_ACEOF
1275    
# Line 1280  Some influential environment variables: Line 1290  Some influential environment variables:
1290                C compiler flags for libxml2, overriding pkg-config                C compiler flags for libxml2, overriding pkg-config
1291    libxml2_LIBS    libxml2_LIBS
1292                linker flags for libxml2, overriding pkg-config                linker flags for libxml2, overriding pkg-config
1293      libsoup24_CFLAGS
1294                  C compiler flags for libsoup24, overriding pkg-config
1295      libsoup24_LIBS
1296                  linker flags for libsoup24, overriding pkg-config
1297      libsoup22_CFLAGS
1298                  C compiler flags for libsoup22, overriding pkg-config
1299      libsoup22_LIBS
1300                  linker flags for libsoup22, overriding pkg-config
1301    libgtkhtml3_14_CFLAGS    libgtkhtml3_14_CFLAGS
1302                C compiler flags for libgtkhtml3_14, overriding pkg-config                C compiler flags for libgtkhtml3_14, overriding pkg-config
1303    libgtkhtml3_14_LIBS    libgtkhtml3_14_LIBS
# Line 1382  fi Line 1400  fi
1400  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1401  if $ac_init_version; then  if $ac_init_version; then
1402    cat <<\_ACEOF    cat <<\_ACEOF
1403  GPXView configure 0.7.4  GPXView configure 0.8.12
1404  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1405    
1406  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 1414  cat >config.log <<_ACEOF
1414  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1415  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1416    
1417  It was created by GPXView $as_me 0.7.4, which was  It was created by GPXView $as_me 0.8.12, which was
1418  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1419    
1420    $ $0 $@    $ $0 $@
# Line 3126  echo "${ECHO_T}yes" >&6; } Line 3144  echo "${ECHO_T}yes" >&6; }
3144  fi  fi
3145  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
3146  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
3147    # check for libsoup
3148    
3149    pkg_failed=no
3150    { echo "$as_me:$LINENO: checking for libsoup24" >&5
3151    echo $ECHO_N "checking for libsoup24... $ECHO_C" >&6; }
3152    
3153    if test -n "$PKG_CONFIG"; then
3154        if test -n "$libsoup24_CFLAGS"; then
3155            pkg_cv_libsoup24_CFLAGS="$libsoup24_CFLAGS"
3156        else
3157            if test -n "$PKG_CONFIG" && \
3158        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3159      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3160      ac_status=$?
3161      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3162      (exit $ac_status); }; then
3163      pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
3164    else
3165      pkg_failed=yes
3166    fi
3167        fi
3168    else
3169            pkg_failed=untried
3170    fi
3171    if test -n "$PKG_CONFIG"; then
3172        if test -n "$libsoup24_LIBS"; then
3173            pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
3174        else
3175            if test -n "$PKG_CONFIG" && \
3176        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3177      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3178      ac_status=$?
3179      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3180      (exit $ac_status); }; then
3181      pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
3182    else
3183      pkg_failed=yes
3184    fi
3185        fi
3186    else
3187            pkg_failed=untried
3188    fi
3189    
3190    
3191    
3192    if test $pkg_failed = yes; then
3193    
3194    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3195            _pkg_short_errors_supported=yes
3196    else
3197            _pkg_short_errors_supported=no
3198    fi
3199            if test $_pkg_short_errors_supported = yes; then
3200                    libsoup24_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
3201            else
3202                    libsoup24_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
3203            fi
3204            # Put the nasty error message in config.log where it belongs
3205            echo "$libsoup24_PKG_ERRORS" >&5
3206    
3207            { echo "$as_me:$LINENO: result: no" >&5
3208    echo "${ECHO_T}no" >&6; }
3209    
3210    
3211    pkg_failed=no
3212    { echo "$as_me:$LINENO: checking for libsoup22" >&5
3213    echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
3214    
3215    if test -n "$PKG_CONFIG"; then
3216        if test -n "$libsoup22_CFLAGS"; then
3217            pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
3218        else
3219            if test -n "$PKG_CONFIG" && \
3220        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3221      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3222      ac_status=$?
3223      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3224      (exit $ac_status); }; then
3225      pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3226    else
3227      pkg_failed=yes
3228    fi
3229        fi
3230    else
3231            pkg_failed=untried
3232    fi
3233    if test -n "$PKG_CONFIG"; then
3234        if test -n "$libsoup22_LIBS"; then
3235            pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
3236        else
3237            if test -n "$PKG_CONFIG" && \
3238        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3239      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3240      ac_status=$?
3241      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3242      (exit $ac_status); }; then
3243      pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3244    else
3245      pkg_failed=yes
3246    fi
3247        fi
3248    else
3249            pkg_failed=untried
3250    fi
3251    
3252    
3253    
3254    if test $pkg_failed = yes; then
3255    
3256    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3257            _pkg_short_errors_supported=yes
3258    else
3259            _pkg_short_errors_supported=no
3260    fi
3261            if test $_pkg_short_errors_supported = yes; then
3262                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3263            else
3264                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3265            fi
3266            # Put the nasty error message in config.log where it belongs
3267            echo "$libsoup22_PKG_ERRORS" >&5
3268    
3269            { echo "$as_me:$LINENO: result: no" >&5
3270    echo "${ECHO_T}no" >&6; }
3271    
3272        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3273    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3274    
3275    elif test $pkg_failed = untried; then
3276    
3277        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3278    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3279    
3280    else
3281            libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
3282            libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
3283            { echo "$as_me:$LINENO: result: yes" >&5
3284    echo "${ECHO_T}yes" >&6; }
3285    
3286        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3287        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3288        LIBS="$LIBS $libsoup22_LIBS"
3289    
3290    fi
3291    
3292    elif test $pkg_failed = untried; then
3293    
3294    
3295    pkg_failed=no
3296    { echo "$as_me:$LINENO: checking for libsoup22" >&5
3297    echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
3298    
3299    if test -n "$PKG_CONFIG"; then
3300        if test -n "$libsoup22_CFLAGS"; then
3301            pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
3302        else
3303            if test -n "$PKG_CONFIG" && \
3304        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3305      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3306      ac_status=$?
3307      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3308      (exit $ac_status); }; then
3309      pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3310    else
3311      pkg_failed=yes
3312    fi
3313        fi
3314    else
3315            pkg_failed=untried
3316    fi
3317    if test -n "$PKG_CONFIG"; then
3318        if test -n "$libsoup22_LIBS"; then
3319            pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
3320        else
3321            if test -n "$PKG_CONFIG" && \
3322        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3323      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3324      ac_status=$?
3325      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3326      (exit $ac_status); }; then
3327      pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3328    else
3329      pkg_failed=yes
3330    fi
3331        fi
3332    else
3333            pkg_failed=untried
3334    fi
3335    
3336    
3337    
3338    if test $pkg_failed = yes; then
3339    
3340    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3341            _pkg_short_errors_supported=yes
3342    else
3343            _pkg_short_errors_supported=no
3344    fi
3345            if test $_pkg_short_errors_supported = yes; then
3346                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3347            else
3348                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3349            fi
3350            # Put the nasty error message in config.log where it belongs
3351            echo "$libsoup22_PKG_ERRORS" >&5
3352    
3353            { echo "$as_me:$LINENO: result: no" >&5
3354    echo "${ECHO_T}no" >&6; }
3355    
3356        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3357    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3358    
3359    elif test $pkg_failed = untried; then
3360    
3361        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3362    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3363    
3364    else
3365            libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
3366            libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
3367            { echo "$as_me:$LINENO: result: yes" >&5
3368    echo "${ECHO_T}yes" >&6; }
3369    
3370        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3371        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3372        LIBS="$LIBS $libsoup22_LIBS"
3373    
3374    fi
3375    
3376    else
3377            libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
3378            libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
3379            { echo "$as_me:$LINENO: result: yes" >&5
3380    echo "${ECHO_T}yes" >&6; }
3381    
3382      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3383      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
3384      LIBS="$LIBS $libsoup24_LIBS"
3385    
3386    fi
3387    
3388  # check for gtkhtml-3.14  # check for gtkhtml-3.14
3389    
# Line 4058  echo "$as_me: Configuring for Maemo $VER Line 4316  echo "$as_me: Configuring for Maemo $VER
4316      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
4317      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
4318    
4319        MAEMO_VERSION_MAJOR=$MAJOR
4320    
4321    
4322  else  else
4323    
4324      { { echo "$as_me:$LINENO: error: maemo-version not found" >&5      { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
# Line 4066  echo "$as_me: error: maemo-version not f Line 4327  echo "$as_me: error: maemo-version not f
4327    
4328  fi  fi
4329    
4330      INSTALL_PLATTFORM="install-maemo"
4331    
4332      # fremantle uses icons of 48x48 pixels for the app installer,
4333      # older versions used 26x26
4334      if [ "$MAJOR" == "5" ]; then
4335         ICONNAME=gpxview.48.png
4336         datarootdir=/opt
4337      else
4338         ICONNAME=gpxview.26.png
4339         { echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
4340    echo "$as_me: Enabling Maemo Mapper support" >&6;}
4341         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
4342         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
4343      fi
4344    
4345    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
4346    EXTRA_OBJS="mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
4347    
4348      { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
4349    echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
4350    
4351    INSTALL_PLATTFORM="install-maemo"    # add icon entry to debian/control
4352      ICON=" Maemo icon $ICONNAME
4353    XB-Maemo-Icon-26:
4354    "
4355    
4356      # generate base64 icon, remove first and last line
4357      # and add a space before each line
4358      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
4359    
4360    
4361  else  else
# Line 4079  else Line 4363  else
4363    { echo "$as_me:$LINENO: result: no" >&5    { echo "$as_me:$LINENO: result: no" >&5
4364  echo "${ECHO_T}no" >&6; }  echo "${ECHO_T}no" >&6; }
4365    
4366      EXTRA_OBJS="$EXTRA_OBJS bct.o"
4367      CFLAGS="$CFLAGS -DBCT"
4368    
4369    # check for gtk+-2.0    # check for gtk+-2.0
4370    
4371  pkg_failed=no  pkg_failed=no
# Line 4239  fi Line 4526  fi
4526    
4527    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
4528    
4529      ICON=" No icon"
4530    
4531  fi  fi
4532    
4533    
4534  ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile"  
4535    
4536    ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile debian/control"
4537    
4538    
4539  cat >confcache <<\_ACEOF  cat >confcache <<\_ACEOF
# Line 4672  exec 6>&1 Line 4962  exec 6>&1
4962  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4963  # values after options handling.  # values after options handling.
4964  ac_log="  ac_log="
4965  This file was extended by GPXView $as_me 0.7.4, which was  This file was extended by GPXView $as_me 0.8.12, which was
4966  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4967    
4968    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4715  Report bugs to <bug-autoconf@gnu.org>." Line 5005  Report bugs to <bug-autoconf@gnu.org>."
5005  _ACEOF  _ACEOF
5006  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
5007  ac_cs_version="\\  ac_cs_version="\\
5008  GPXView config.status 0.7.4  GPXView config.status 0.8.12
5009  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
5010    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
5011    
# Line 4817  do Line 5107  do
5107      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5108      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
5109      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
5110        "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
5111    
5112    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
5113  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
# Line 4932  gnome_vfs_module_CFLAGS!$gnome_vfs_modul Line 5223  gnome_vfs_module_CFLAGS!$gnome_vfs_modul
5223  gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim  gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim
5224  libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim  libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim
5225  libxml2_LIBS!$libxml2_LIBS$ac_delim  libxml2_LIBS!$libxml2_LIBS$ac_delim
5226    libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim
5227    libsoup24_LIBS!$libsoup24_LIBS$ac_delim
5228    libsoup22_CFLAGS!$libsoup22_CFLAGS$ac_delim
5229    libsoup22_LIBS!$libsoup22_LIBS$ac_delim
5230  libgtkhtml3_14_CFLAGS!$libgtkhtml3_14_CFLAGS$ac_delim  libgtkhtml3_14_CFLAGS!$libgtkhtml3_14_CFLAGS$ac_delim
5231  libgtkhtml3_14_LIBS!$libgtkhtml3_14_LIBS$ac_delim  libgtkhtml3_14_LIBS!$libgtkhtml3_14_LIBS$ac_delim
5232  libgtkhtml3_8_CFLAGS!$libgtkhtml3_8_CFLAGS$ac_delim  libgtkhtml3_8_CFLAGS!$libgtkhtml3_8_CFLAGS$ac_delim
# Line 4950  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim Line 5245  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
5245  gpsbt_LIBS!$gpsbt_LIBS$ac_delim  gpsbt_LIBS!$gpsbt_LIBS$ac_delim
5246  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
5247  liblocation_LIBS!$liblocation_LIBS$ac_delim  liblocation_LIBS!$liblocation_LIBS$ac_delim
5248  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  MAEMO_VERSION_MAJOR!$MAEMO_VERSION_MAJOR$ac_delim
 INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim  
5249  gtk_CFLAGS!$gtk_CFLAGS$ac_delim  gtk_CFLAGS!$gtk_CFLAGS$ac_delim
5250  gtk_LIBS!$gtk_LIBS$ac_delim  gtk_LIBS!$gtk_LIBS$ac_delim
5251  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
5252  gnome2_LIBS!$gnome2_LIBS$ac_delim  gnome2_LIBS!$gnome2_LIBS$ac_delim
5253    EXTRA_OBJS!$EXTRA_OBJS$ac_delim
5254    ICON!$ICON$ac_delim
5255    INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
5256  LIBOBJS!$LIBOBJS$ac_delim  LIBOBJS!$LIBOBJS$ac_delim
5257  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
5258  _ACEOF  _ACEOF
5259    
5260    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` = 87; then
5261      break      break
5262    elif $ac_last_try; then    elif $ac_last_try; then
5263      { { 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.30  
changed lines
  Added in v.154