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 169 by harbaum, Mon Nov 9 14:26:13 2009 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.8.13],[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 libsoup
74    PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
75      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
76      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
77      LIBS="$LIBS $libsoup24_LIBS"
78    ], [
79      PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
80        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
81        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
82        LIBS="$LIBS $libsoup22_LIBS"
83      ], [
84        AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
85      ])
86    ])
87    
88  # check for gtkhtml-3.14  # check for gtkhtml-3.14
89  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [
90    CFLAGS="$CFLAGS $libgtkhtml3_14_CFLAGS"    CFLAGS="$CFLAGS $libgtkhtml3_14_CFLAGS"
# Line 110  PKG_CHECK_EXISTS(maemo-version, [ Line 130  PKG_CHECK_EXISTS(maemo-version, [
130    
131    # prefer gpsbt over liblocation as we got complaints regarding liblocation    # prefer gpsbt over liblocation as we got complaints regarding liblocation
132    # stability    # stability
133  #  PKG_CHECK_EXISTS(gpsbt, [    PKG_CHECK_EXISTS(gpsbt, [
134  #    PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
135  #    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
136  #    LIBS="$LIBS $gpsbt_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
137  #  ], [    ], [
138      AC_MSG_NOTICE([gpsbt not found, trying liblocation])      AC_MSG_NOTICE([gpsbt not found, trying liblocation])
139    
140      PKG_CHECK_EXISTS(liblocation, [      PKG_CHECK_EXISTS(liblocation, [
# Line 124  PKG_CHECK_EXISTS(maemo-version, [ Line 144  PKG_CHECK_EXISTS(maemo-version, [
144      ], [      ], [
145        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!])
146      ])      ])
147  #  ])    ])
148    
149    PKG_CHECK_EXISTS(tablet-browser-interface, [    PKG_CHECK_EXISTS(tablet-browser-interface, [
150      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
# Line 136  PKG_CHECK_EXISTS(maemo-version, [ Line 156  PKG_CHECK_EXISTS(maemo-version, [
156      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
157      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
158      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
159    
160        MAEMO_VERSION_MAJOR=$MAJOR
161        AC_SUBST(MAEMO_VERSION_MAJOR)
162    ], [    ], [
163      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
164    ])    ])
165    
166      INSTALL_PLATTFORM="install-maemo"
167    
168      # fremantle uses icons of 48x48 pixels for the app installer,
169      # older versions used 26x26
170      if [[ "$MAJOR" == "5" ]]; then
171         ICONNAME=gpxview.48.png
172         datarootdir=/opt
173      else
174         ICONNAME=gpxview.26.png
175         AC_MSG_NOTICE([Enabling Maemo Mapper support])
176         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
177         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
178      fi
179    
180    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
181    EXTRA_OBJS="mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
   AC_SUBST(EXTRA_OBJS)  
182    
183    INSTALL_PLATTFORM="install-maemo"    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
   AC_SUBST(INSTALL_PLATTFORM)  
184    
185      # add icon entry to debian/control
186      ICON=" Maemo icon $ICONNAME
187    XB-Maemo-Icon-26:
188    "
189    
190      # generate base64 icon, remove first and last line
191      # and add a space before each line
192      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
193    
194  ], [  ], [
195    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
196    
197      EXTRA_OBJS="$EXTRA_OBJS bct.o"
198      CFLAGS="$CFLAGS -DBCT"
199    
200    # check for gtk+-2.0    # check for gtk+-2.0
201    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!])])
202    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
# Line 161  PKG_CHECK_EXISTS(maemo-version, [ Line 208  PKG_CHECK_EXISTS(maemo-version, [
208    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
209    
210    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
   AC_SUBST(INSTALL_PLATTFORM)  
 ])  
211    
212      ICON=" No icon"
213    ])
214    
215  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_SUBST(EXTRA_OBJS)
216    AC_SUBST(ICON)
217    AC_SUBST(INSTALL_PLATTFORM)
218    AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
219    
220  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.8  
changed lines
  Added in v.169