Diff of /trunk/configure.in

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

revision 8 by harbaum, Thu Jun 25 19:08:48 2009 UTC revision 246 by harbaum, Tue Jan 19 20:26:37 2010 UTC
# Line 21  Line 21 
21  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
22    
23  AC_PREREQ(2.61)  AC_PREREQ(2.61)
24  AC_INIT([GPXView],[0.7.0],[till@harbaum.org])  AC_INIT([GPXView],[0.9.2],[till@harbaum.org])
25  AC_CONFIG_SRCDIR([src/main.c])  AC_CONFIG_SRCDIR([src/main.c])
26  # AC_CONFIG_HEADER([src/config.h])  # AC_CONFIG_HEADER([src/config.h])
27    
# Line 65  PKG_CHECK_MODULES([libxml2], [libxml-2.0 Line 65  PKG_CHECK_MODULES([libxml2], [libxml-2.0
65  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
66  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
67    
68    # check for libcurl
69    PKG_CHECK_MODULES([libcurl], [libcurl], [], [AC_MSG_ERROR([libcurl missing])])
70    CFLAGS="$CFLAGS $libcurl_CFLAGS"
71    LIBS="$LIBS $libcurl_LIBS"
72    
73    # check for libespeak (consider moving this to maemo5)
74    AC_CHECK_HEADERS(espeak/speak_lib.h, [
75    CFLAGS="$CFLAGS -DESPEAK"
76    LIBS="$LIBS -lespeak"
77    ])
78    
79    # check for libsoup
80    PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
81      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
82      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
83      LIBS="$LIBS $libsoup24_LIBS"
84    ], [
85      PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
86        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
87        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
88        LIBS="$LIBS $libsoup22_LIBS"
89      ], [
90        AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
91      ])
92    ])
93    
94  # check for gtkhtml-3.14  # check for gtkhtml-3.14
95  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [
96    CFLAGS="$CFLAGS $libgtkhtml3_14_CFLAGS"    CFLAGS="$CFLAGS $libgtkhtml3_14_CFLAGS"
# Line 110  PKG_CHECK_EXISTS(maemo-version, [ Line 136  PKG_CHECK_EXISTS(maemo-version, [
136    
137    # prefer gpsbt over liblocation as we got complaints regarding liblocation    # prefer gpsbt over liblocation as we got complaints regarding liblocation
138    # stability    # stability
139  #  PKG_CHECK_EXISTS(gpsbt, [    PKG_CHECK_EXISTS(gpsbt, [
140  #    PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
141  #    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
142  #    LIBS="$LIBS $gpsbt_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
143  #  ], [    ], [
144      AC_MSG_NOTICE([gpsbt not found, trying liblocation])      AC_MSG_NOTICE([gpsbt not found, trying liblocation])
145    
146      PKG_CHECK_EXISTS(liblocation, [      PKG_CHECK_EXISTS(liblocation, [
# Line 124  PKG_CHECK_EXISTS(maemo-version, [ Line 150  PKG_CHECK_EXISTS(maemo-version, [
150      ], [      ], [
151        AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])        AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])
152      ])      ])
153  #  ])    ])
154    
155    PKG_CHECK_EXISTS(tablet-browser-interface, [    PKG_CHECK_EXISTS(tablet-browser-interface, [
156      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
# Line 136  PKG_CHECK_EXISTS(maemo-version, [ Line 162  PKG_CHECK_EXISTS(maemo-version, [
162      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
163      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
164      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
165    
166        MAEMO_VERSION_MAJOR=$MAJOR
167        AC_SUBST(MAEMO_VERSION_MAJOR)
168    ], [    ], [
169      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
170    ])    ])
171    
172      INSTALL_PLATTFORM="install-maemo"
173    
174      # fremantle uses icons of 48x48 pixels for the app installer,
175      # older versions used 26x26
176      if [[ "$MAJOR" == "5" ]]; then
177         ICONNAME=48x48/gpxview.png
178         datarootdir=/opt
179      else
180         ICONNAME=26x26/gpxview.png
181         AC_MSG_NOTICE([Enabling Maemo Mapper support])
182      fi
183    
184      CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
185      EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
186    
187    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
188    EXTRA_OBJS="mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
   AC_SUBST(EXTRA_OBJS)  
189    
190    INSTALL_PLATTFORM="install-maemo"    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
   AC_SUBST(INSTALL_PLATTFORM)  
191    
192      # add icon entry to debian/control
193      ICON=" Maemo icon $ICONNAME
194    XB-Maemo-Icon-26:
195    "
196    
197      # generate base64 icon, remove first and last line
198      # and add a space before each line
199      ICON="$ICON`uuencode -m data/icons/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
200    
201  ], [  ], [
202    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
203    
204      EXTRA_OBJS="$EXTRA_OBJS bct.o"
205      CFLAGS="$CFLAGS -DBCT"
206    
207    # check for gtk+-2.0    # check for gtk+-2.0
208    PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])    PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])
209    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
# Line 161  PKG_CHECK_EXISTS(maemo-version, [ Line 215  PKG_CHECK_EXISTS(maemo-version, [
215    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
216    
217    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
   AC_SUBST(INSTALL_PLATTFORM)  
 ])  
218    
219      ICON=" No icon"
220    ])
221    
222  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_SUBST(EXTRA_OBJS)
223    AC_SUBST(ICON)
224    AC_SUBST(INSTALL_PLATTFORM)
225    AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
226    
227  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.8  
changed lines
  Added in v.246