head 1.16; access; symbols; locks; strict; comment @# @; 1.16 date 2007.11.20.19.12.54; author jgarrett; state Exp; branches; next 1.15; commitid QZCBZoGfN73EBlGs; 1.15 date 2007.09.08.06.23.44; author jgarrett; state Exp; branches; next 1.14; commitid keJaxkUzYy6JGTws; 1.14 date 2005.10.18.03.05.25; author ian; state Exp; branches; next 1.13; commitid 1e7d4354665d4567; 1.13 date 2005.09.24.05.25.24; author ian; state Exp; branches; next 1.12; commitid 313e4334e3234567; 1.12 date 2005.09.06.02.44.19; author ian; state Exp; branches; next 1.11; commitid 28d7431d024b4567; 1.11 date 2005.03.04.04.35.42; author nrf; state Exp; branches; next 1.10; 1.10 date 2005.03.03.06.45.09; author nrf; state Exp; branches; next 1.9; 1.9 date 2005.03.02.21.28.54; author nrf; state Exp; branches; next 1.8; 1.8 date 2005.03.01.04.00.10; author nrf; state Exp; branches; next 1.7; 1.7 date 2005.02.28.08.48.30; author nrf; state Exp; branches; next 1.6; 1.6 date 2005.02.28.06.31.04; author nrf; state Exp; branches; next 1.5; 1.5 date 2005.02.28.03.25.23; author ian; state Exp; branches; next 1.4; 1.4 date 2005.02.26.04.41.40; author ian; state Exp; branches; next 1.3; 1.3 date 2005.02.24.19.38.59; author nrf; state Exp; branches; next 1.2; 1.2 date 2005.02.23.18.29.58; author ian; state Exp; branches; next 1.1; 1.1 date 2005.02.23.17.43.49; author ian; state Exp; branches; next ; desc @@ 1.16 log @Add a redirection to the proper git repository. @ text @dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT(roadster, 0.2.9) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS") AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE AM_PROG_LIBTOOL AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC AC_PROG_CXX AC_STDC_HEADERS AC_PROG_LIBTOOL AC_PROG_INTLTOOL dnl GNOME_DEBUG_CHECK ALL_LINGUAS="" CFLAGS="$CFLAGS -Wall" AM_GLIB_GNU_GETTEXT PACKAGE_LOCALE_DIR="${PACKAGE_PREFIX}/${DATADIRNAME}/locale" AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,"$PACKAGE_LOCALE_DIR", [The package's locale path for gettext]) GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) dnl ========= check for gnome libraries ======================================== PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 gtk+-2.0 libglade-2.0 libxml-2.0,,) AC_SUBST(GNOME_LIBS) AC_SUBST(GNOME_CFLAGS) dnl ========= check for cairo ================================================== PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) dnl ========= check for libsvg ================================================= PKG_CHECK_MODULES(LIBSVG, libsvg libsvg-cairo, [AC_DEFINE([HAVE_LIBSVG], [1], [Have libsvg])], continue ) AC_SUBST(LIBSVG_LIBS) AC_SUBST(LIBSVG_CFLAGS) dnl ========= deprecated options =============================================== AC_ARG_ENABLE(deprecated, AC_HELP_STRING([--disable-deprecated], [Don't allow any deprecated GTK+/etc. features.]), set_enable_deprecated="$enableval",[ if test -f $srcdir/autogen.sh; then is_cvs_version=true set_enable_deprecated=no else set_enable_deprecated=yes fi ]) AC_MSG_CHECKING([whether to disable deprecated glib/gtk+/etc. features]) if test "$set_enable_deprecated" != "yes"; then AC_MSG_RESULT(yes) ROADSTER_DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" else AC_MSG_RESULT(no) ROADSTER_DISABLE_DEPRECATED="" fi AC_SUBST(ROADSTER_DISABLE_DEPRECATED) dnl ========= check for MySQL ================================================== AC_ARG_WITH(mysql, [ --with-mysql= prefix of mysql installation.], [ MYSQL_PREFIX=$with_mysql ], [ MYSQL_PREFIX=/usr ]) AC_PATH_PROG(mysqlconfig,mysql_config,,[$MYSQL_PREFIX/bin:$PATH]) if test [ -z "$mysqlconfig" ] then AC_MSG_ERROR([mysql_config executable not found: MySQL 4.1.0 or greater is required.]) else AC_MSG_CHECKING(MySQL libraries) MYSQL_VERSION=`${mysqlconfig} --version` MYSQL_LIBS=`${mysqlconfig} --libs` AC_MSG_RESULT($MYSQL_LIBS) AC_MSG_CHECKING(mysql includes) MYSQL_CFLAGS=`${mysqlconfig} --cflags` AX_COMPARE_VERSION("$MYSQL_VERSION", [ge], [4.1.0], AC_MSG_RESULT("$MYSQL_CFLAGS"), AC_MSG_ERROR([MySQL version 4.1.0 or greater required.])) AC_SUBST(MYSQL_LIBS) AC_SUBST(MYSQL_CFLAGS) fi dnl ========= check for GPSD =================================================== AC_ARG_WITH(gpsd, [ --with-gpsd= prefix of gpsd installation.], [ GPSD_PREFIX=$with_gpsd ], [ GPSD_PREFIX=/usr ]) CPPFLAGS="$CPPFLAGS -I${GPSD_PREFIX}/include" AC_CHECK_HEADERS(gps.h, , AC_MSG_ERROR([GPSD not found. Use --with-gpsd=prefix to specify the location of GPSD.])) AC_SUBST(GPSD_PREFIX) GPSD_LIBS="-L${GPSD_PREFIX}/lib -lgps" GPSD_CFLAGS="-I${GPSD_PREFIX}/include" AC_SUBST(GPSD_LIBS) AC_SUBST(GPSD_CFLAGS) dnl ========= set data dir ===================================================== if test "x${datadir}" = 'x${prefix}/share'; then if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Directory of data files]) else AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Directory of data files]) fi else AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Directory of data files]) fi dnl ========= set source dir =================================================== PACKAGE_SOURCE_DIR=`cd $srcdir && pwd` AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "$PACKAGE_SOURCE_DIR", [The source path]) AC_MSG_ERROR([Roadster is now maintained at:] [ git://git.freedesktop.org/git/roadster] [Please use that repository.]) dnl ========= output =========================================================== AC_OUTPUT([ Makefile data/Makefile src/Makefile pixmaps/Makefile po/Makefile.in data/roadster.desktop ]) @ 1.15 log @ * src/main.c: Add configuration for external MySQL server * configure.ac: * src/db.c: Remove MySQL embedded server @ text @d140 4 @ 1.14 log @ * configure.ac: Added -Wall compiler option (show all warnings). * src/map_draw_cairo.c: The return of Cairo! Now drawing from tile data and using bounding box overlap tests. * src/map_hittest.c: The return of hittesting! * src/db.c: Remove dead code. * src/downloadmanager.c: Properly return a value from a GnomeVFS callback. * src/import_tiger.c: Switch from GPtrArrays to GArrays for points. * src/main.c: Properly include libintl.h * src/map.c: Cleanups. Dead code removal. * src/map_draw_gdk.c: Add random road segment color option for debugging. * src/map_math.c: Added polygon clipping and line stitching. * src/map_tilemanager.c: Do basic line stitching at load time. * src/mainwindow.c: Cleanups. Move some code to util.c * src/util.c: Receive some code from mainwindow.c @ text @d95 1 a95 2 MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lmygcc -lsupc++" AC_DEFINE([HAVE_MYSQL_EMBED], [1], [Have embedded MySQL]) @ 1.13 log @2005-09-24 Ian McIntosh * data/roadster.glade: New "Go" menu with web maps. General GUI cleanup. * src/glyph.c: Complete rework. Removes direct usage of librsvg. Now uses only gdkpixbuf loaders (including the librsvg one!) * src/locationeditwindow.c: * src/mainwindow.c: Use GLADE_LINK_WIDGET. Add "web maps" menu options. Add glyph reload debug menu option. Possibly fix 'failure to stop scrolling' bug. * src/map.c: Beginning of support for "enhancing" map objects at run-time (adding points, smoothing sharp edges). * src/map.h: Fix a few 'double' which should be 'gdouble' * src/search_city.c: New search type matches city names. * src/search_road.c: Removed common code. No longer do wildcard "search*" matching. No longer display house #s in results. * src/search_location.c: Removed common code. * src/search.c: Moved common search code here. * src/searchwindow.c: Add icon. Lots of small "look & feel" updates. * src/util.c: Add new word-in-sentence matching for treeview searches. Add some treeview utility functions. Add util_str_replace_many() for replacing eg "{LAT}" with a number for web map URLs. * src/welcomewindow.c: Update currently unused TIGER Data Web URL. * src/db.c: Playing with soundex() matching for roads and city names. * configure.ac: Bumped version. Hey why not. @ text @d28 2 @ 1.12 log @ * src/db.c: Better error handling (silences "duplicate key" warning on startup). * src/import_tiger.c: Comment out some cleanup code that has a crasher bug somewhere (now it's just a memory leak!). * src/mainwindow.c: Updated comments, removed some dead code. * src/importwindow.c: Add a printf showing # of files received from file chooser dialog. * src/layers.c: Implemented new layers XML format. Draw order is now dictated by the XML file. Removed concept of "sublayers". Unlimited layers are now supported. * src/map.c: Removed layer draw order table. Changed scenemanager test from a rectangle to a diamond. * src/map_draw_cairo.c: Added map scale rendering. Cairo rendering commented out until it can be updated to new layer style stuff. * src/map_draw_gdk.c: Updated for new layer format. * data/layers.xml: Complete rewrite for new layers format. * configure.ac: Remove old/incorrect tests. * data/roadster.glade: Removed some old/unused dialogs. @ text @d4 1 a4 1 AC_INIT(roadster, 0.2.8) @ 1.11 log @ * configure.ac: Enable directives to disable deprecated features. * src/main.c: Call gnome_program_init() instead of deprecated gnome_program_init(). * src/mainwindow.c: Call gdk_draw_drawable() instead of deprecated gdk_draw_pixmap(). @ text @d4 1 a4 1 AC_INIT(roadster, 0.2.0) d39 1 a39 1 PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 gtk+-2.0 libglade-2.0 libxml-2.0,,exit) d44 1 a44 1 PKG_CHECK_MODULES(CAIRO, cairo,,exit) a48 5 PKG_CHECK_MODULES(, cairo > 0.2.0, [AC_DEFINE([HAVE_CAIRO_0_2_0], [1], [Newer Cairo])], continue ) @ 1.10 log @ * data/Makefile.am: * configure.ac: Add dependency on libxml-2.0. * data/layers.xml: Map layer styles defined in XML. * src/main.c: * src/map.c: * src/layers.h: * src/layers.c: Load map layer styles from an XML file. @ text @a20 1 dnl AC_PROG_RANLIB d77 1 a77 3 dnl disbale this until we're ready to clean up deprecated stuff dnl ROADSTER_DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" ROADSTER_DISABLE_DEPRECATED="" a84 1 dnl AM_PATH_MYSQL([4.1.0], , AC_MSG_ERROR([MySQL >= 4.1.0 is required.])) @ 1.9 log @ * src/Makefile.am: * configure.ac: Check separately for libsvg and continue if not found. Define HAVE_LIBSVG if present. @ text @d40 1 a40 1 PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 gtk+-2.0 libglade-2.0,,exit) @ 1.8 log @ * configure.ac: re-add important whitespace @ text @d45 1 a45 1 PKG_CHECK_MODULES(CAIRO, cairo libsvg libsvg-cairo,,exit) d55 8 @ 1.7 log @ * README: Update dependency list. * configure.ac: Re-add -lmygcc. Clean up. @ text @d50 1 a50 1 PKG_CHECK_MODULES(, cairo>0.2.0, @ 1.6 log @2005-02-28 Nathan Fredrickson * main.c: Make main_init() return a value. * mainwindow.c: Add missing prototype. * configure.ac: Add pkgconfig check for libsvg and libsvg-cairo. * src/Makefile.am: Remove the hacky inclusion of libsvg-cairo. @ text @d91 1 a91 1 AC_MSG_CHECKING(mysql libraries) d94 1 a94 5 dnl MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \ dnl 's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'` dnl test embedded mysql MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lsupc++" d103 1 a103 1 AC_MSG_ERROR([mysql version 4.1.0 or greater required])) @ 1.5 log @ * configure.ac: Added libsvg-cairo as dependency. (Not quite correct? Nate will fix it.:) * Makefile.am: Added glyph.c. * datasetwindow.c: Removed Import button. * db.c: Removed debugging comments. City with the same name are no longer shared between states. * geometryset.c: Expired a bunch of old code. * gotowindow.c: Use mappoint_t instead of loose lat/lon variables. * gui.c: Changed an error message. * main.c: Move init/deinit code from main() to main_init() and main_deinit() * mainwindow.c: Some cleanup and early support for SVG icon loading. * map.c: Renamed some variables and functions. Moved start location from arbitrary spot in MA, USA to (0,0) * pointstring.c: Clean up. * search_location.c: Use new map_* function names. * search_road.c: Use city, state, and zip if present. * searchwindow.c: Correctly use G_TYPE_DOUBLE to store coordinates. Use mappoint_t instead of loose variables. @ text @d45 1 a45 6 dnl PKG_CHECK_MODULES(CAIRO, cairo libsvg-cairo,,exit) PKG_CHECK_MODULES(CAIRO, cairo > 0.2.0, [AC_DEFINE([HAVE_NEWER_CAIRO], [1], [Newer Cairo])], [PKG_CHECK_MODULES(CAIRO, cairo,,exit)] ) d50 5 d98 1 a98 1 MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lmygcc -lsupc++" @ 1.4 log @ * track.c: * track.h: * point.c: * point.h: * pointstring.c: * pointstring.h: Added. * configure.ac: Updated for embedded mysql. * src/Makefile.am: Added new files. * databasewindow.c: Made all dead code. (No need for database window with embedded mysql) * db.c: Assume string format from embedded DB is reasonable in db_parse_point() and db_parse_pointstring(). * geometryset.c: Move point and pointstring code into separate files. * gpsclient.c: Misc cleanup. * gui.c: Remove databasewindow from startup code path. * import.c: Remove GnomeVFS init. * main.c: Add GnomeVFS init. Create ~/.roadster if missing. * layers.c: Style tweaks. * mainwindow.c: Add quasi-hack to record/draw GPS tracks. * map.c: Layer "halo" setting is now a stroke width number, not a boolean. Don't call cairo_set_dash for solid lines. New track drawing. * search_road.c: Use renamed pointstring functions. @ text @d45 1 a45 1 dnl PKG_CHECK_MODULES(CAIRO, cairo,,exit) @ 1.3 log @ * po/roadster.pot: Removed, this is generated. * po/POTFILES.in: Add glade file to the translatable files. * data/.cvsignore: Added. * .cvsignore: Add some more build files. * configure.ac: Look for MySQL in given prefix before $PATH. @ text @d93 8 a100 2 MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \ 's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'` @ 1.2 log @ * data/Makefile.am: Added. * configure.ac: Removed GNOME_DEBUG_CHECK. @ text @d86 1 a86 1 AC_PATH_PROG(mysqlconfig,mysql_config,,[$PATH:$MYSQL_PREFIX/bin]) @ 1.1 log @*** empty log message *** @ text @d25 1 a25 1 GNOME_DEBUG_CHECK @