Add missing include of stdlib.h.

Added gettext and gpsd to the dependency list.
Add a bunch of .cvsignore files.
Remove file that shouldn't have been in CVS.
Don't force a static build.

12 files changed, 59 insertions, 222 deletions

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..5fb19b9
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,21 @@
+Makefile
+Makefile.in
+acconfig.h
+acinclude.m4
+aclocal.m4
+autogen.sh
+autom4te.cache
+config.guess
+config.h
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+roadster.desktop
+stamp-h1
diff --git a/ChangeLog b/ChangeLog
index e69de29..b0fbdfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,18 @@
+2005-02-18  Carl Worth  <cworth@cworth.org>
+
+	* src/search_road.c: Add missing include of stdlib.h.
+
+	* README: Added gettext and gpsd to the dependency list.
+
+	* .cvsignore:
+	* include/.cvsignore:
+	* intl/.cvsignore:
+	* macros/.cvsignore:
+	* pixmaps/.cvsignore:
+	* po/.cvsignore:
+	* src/.cvsignore: Add a bunch of .cvsignore files.
+
+	* config.h.in: Remove file that shouldn't have been in CVS.
+	
+	* src/Makefile.am: Don't force a static build.
+
diff --git a/README b/README
index 6174e16..556ebac 100644
--- a/README
+++ b/README
@@ -3,6 +3,8 @@ To compile, you will need:
 - cairo
 - libpixman
 - mysql libraries and header files (v4.1 or newer)
+- gettext library and header files
+- gpsd program and header files
 
 To run Roadster, you will need:
 - mysql server (v4.1+ or newer)
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 47776f4..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,220 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef PACKAGE_LOCALE_DIR
-#undef PACKAGE_DOC_DIR
-#undef PACKAGE_DATA_DIR
-#undef PACKAGE_PIXMAPS_DIR
-#undef PACKAGE_HELP_DIR
-#undef PACKAGE_MENU_DIR
-#undef PACKAGE_SOURCE_DIR
-#undef GETTEXT_PACKAGE
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* Package name for gettext */
-#undef GETTEXT_PACKAGE
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define to 1 if you have the `dcgettext' function. */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `feof_unlocked' function. */
-#undef HAVE_FEOF_UNLOCKED
-
-/* Define to 1 if you have the `fgets_unlocked' function. */
-#undef HAVE_FGETS_UNLOCKED
-
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define to 1 if you have the `getgid' function. */
-#undef HAVE_GETGID
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-#undef inline
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/include/.cvsignore b/include/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/include/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/intl/.cvsignore b/intl/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/intl/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/macros/.cvsignore b/macros/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/macros/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/pixmaps/.cvsignore b/pixmaps/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/pixmaps/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/po/.cvsignore b/po/.cvsignore
new file mode 100644
index 0000000..c52251b
--- /dev/null
+++ b/po/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+POTFILES
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..3ab260f
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+Makefile.in
+roadster
diff --git a/src/Makefile.am b/src/Makefile.am
index f50a328..e6a60b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,6 @@ roadster_SOURCES = \
 	databasewindow.c
 
 roadster_LDFLAGS = \
-	-static\
 	 -L/usr/lib/mysql
 
 roadster_LDADD =  \
diff --git a/src/search_road.c b/src/search_road.c
index 3134a91..4b6b10e 100644
--- a/src/search_road.c
+++ b/src/search_road.c
@@ -23,6 +23,7 @@
  
 #include <gtk/gtk.h>
 #include <math.h>
+#include <stdlib.h>
 
 #include "../include/db.h"
 #include "../include/util.h"
@@ -41,7 +42,7 @@ typedef struct {
 #define SEARCH_RESULT_COUNT_LIMIT	(200)		// how many rows to get from DB
 #define MAX_QUERY 	(4000)
 
-#if 1 		// glib < 2.6
+#if 0 		// glib < 2.6
 gint g_strv_length(const gchar** a)
 {
 	gint nCount=0;