Diff of /trunk/configure

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 117 by harbaum, Thu Sep 17 07:33:13 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.5.  # Generated by GNU Autoconf 2.61 for GPXView 0.8.10.
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.5'  PACKAGE_VERSION='0.8.10'
578  PACKAGE_STRING='GPXView 0.8.5'  PACKAGE_STRING='GPXView 0.8.10'
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 661  gtk_LIBS Line 661  gtk_LIBS
661  gnome2_CFLAGS  gnome2_CFLAGS
662  gnome2_LIBS  gnome2_LIBS
663  EXTRA_OBJS  EXTRA_OBJS
664    ICON
665  INSTALL_PLATTFORM  INSTALL_PLATTFORM
666  LIBOBJS  LIBOBJS
667  LTLIBOBJS'  LTLIBOBJS'
# Line 1206  if test "$ac_init_help" = "long"; then Line 1207  if test "$ac_init_help" = "long"; then
1207    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1208    # 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.
1209    cat <<_ACEOF    cat <<_ACEOF
1210  \`configure' configures GPXView 0.8.5 to adapt to many kinds of systems.  \`configure' configures GPXView 0.8.10 to adapt to many kinds of systems.
1211    
1212  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1213    
# Line 1267  fi Line 1268  fi
1268    
1269  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1270    case $ac_init_help in    case $ac_init_help in
1271       short | recursive ) echo "Configuration of GPXView 0.8.5:";;       short | recursive ) echo "Configuration of GPXView 0.8.10:";;
1272     esac     esac
1273    cat <<\_ACEOF    cat <<\_ACEOF
1274    
# Line 1398  fi Line 1399  fi
1399  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1400  if $ac_init_version; then  if $ac_init_version; then
1401    cat <<\_ACEOF    cat <<\_ACEOF
1402  GPXView configure 0.8.5  GPXView configure 0.8.10
1403  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1404    
1405  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1412  cat >config.log <<_ACEOF Line 1413  cat >config.log <<_ACEOF
1413  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1414  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1415    
1416  It was created by GPXView $as_me 0.8.5, which was  It was created by GPXView $as_me 0.8.10, which was
1417  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1418    
1419    $ $0 $@    $ $0 $@
# Line 3281  else Line 3282  else
3282          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3283  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3284    
3285      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3286      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3287      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
3288    
# Line 3365  else Line 3366  else
3366          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3367  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3368    
3369      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3370      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3371      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
3372    
# Line 3377  else Line 3378  else
3378          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3379  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3380    
3381    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3382    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
3383    LIBS="$LIBS $libsoup24_LIBS"    LIBS="$LIBS $libsoup24_LIBS"
3384    
# Line 4327  fi Line 4328  fi
4328    
4329    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
4330    
4331      # fremantle uses icons of 48x48 pixels for the app installer
4332      if [ "$MAJOR" == "5" ]; then
4333         ICONNAME=gpxview.48.png
4334      else
4335         ICONNAME=gpxview.26.png
4336      fi
4337    
4338      { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
4339    echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
4340    
4341      # add icon entry to debian/control
4342      ICON=" Maemo icon $ICONNAME
4343    XB-Maemo-Icon-26:
4344    "
4345    
4346      # generate base64 icon, remove first and last line
4347      # and add a space before each line
4348      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
4349    
4350    
4351  else  else
4352    
# Line 4493  fi Line 4513  fi
4513    
4514    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
4515    
4516      ICON=" No icon"
4517    
4518  fi  fi
4519    
4520    
4521    
4522  ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile"  
4523    ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile debian/control"
4524    
4525    
4526  cat >confcache <<\_ACEOF  cat >confcache <<\_ACEOF
# Line 4926  exec 6>&1 Line 4949  exec 6>&1
4949  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4950  # values after options handling.  # values after options handling.
4951  ac_log="  ac_log="
4952  This file was extended by GPXView $as_me 0.8.5, which was  This file was extended by GPXView $as_me 0.8.10, which was
4953  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4954    
4955    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4969  Report bugs to <bug-autoconf@gnu.org>." Line 4992  Report bugs to <bug-autoconf@gnu.org>."
4992  _ACEOF  _ACEOF
4993  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4994  ac_cs_version="\\  ac_cs_version="\\
4995  GPXView config.status 0.8.5  GPXView config.status 0.8.10
4996  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4997    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4998    
# Line 5071  do Line 5094  do
5094      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5095      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
5096      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
5097        "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
5098    
5099    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
5100  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
# Line 5213  gtk_LIBS!$gtk_LIBS$ac_delim Line 5237  gtk_LIBS!$gtk_LIBS$ac_delim
5237  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
5238  gnome2_LIBS!$gnome2_LIBS$ac_delim  gnome2_LIBS!$gnome2_LIBS$ac_delim
5239  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
5240    ICON!$ICON$ac_delim
5241  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
5242  LIBOBJS!$LIBOBJS$ac_delim  LIBOBJS!$LIBOBJS$ac_delim
5243  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
5244  _ACEOF  _ACEOF
5245    
5246    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
5247      break      break
5248    elif $ac_last_try; then    elif $ac_last_try; then
5249      { { 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.61  
changed lines
  Added in v.117