[cairo-commit] roadster ChangeLog, 1.15, 1.16 config.h.in, 1.3,
1.4 configure.ac, NONE, 1.1
Ian McIntosh
commit at pdx.freedesktop.org
Wed Feb 23 09:43:52 PST 2005
Committed by: ian
Update of /cvs/cairo/roadster
In directory gabe:/tmp/cvs-serv27910
Modified Files:
ChangeLog config.h.in
Added Files:
configure.ac
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/roadster/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog 23 Feb 2005 17:22:06 -0000 1.15
+++ ChangeLog 23 Feb 2005 17:43:49 -0000 1.16
@@ -1,4 +1,9 @@
2005-02-23 Ian McIntosh <ian_mcintosh at linuxadvocate.org>
+
+ * configure.ac: Added.
+ * Header files actually moved.
+
+2005-02-23 Ian McIntosh <ian_mcintosh at linuxadvocate.org>
* Major build file cleanup by Nathan Fredrickson <nathan at silverorange.com>
* All header files moved into src/
Index: config.h.in
===================================================================
RCS file: /cvs/cairo/roadster/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.h.in 18 Feb 2005 21:52:06 -0000 1.3
+++ config.h.in 23 Feb 2005 17:43:49 -0000 1.4
@@ -1,250 +1,80 @@
-/* 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
+/* config.h.in. Generated from configure.ac by autoheader. */
-/* Define to 1 if translation of program messages to the user's native
- language is requested. */
+/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
-/* Package name for gettext */
+/* Gettext package. */
#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 `asprintf' function. */
-#undef HAVE_ASPRINTF
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-/* Define if the GNU dcgettext() function is already present or preinstalled.
- */
+/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
- don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
- you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
- don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
- don't. */
-#undef HAVE_DECL__SNPRINTF
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
- don't. */
-#undef HAVE_DECL__SNWPRINTF
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
-/* 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 if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
+/* Define to 1 if you have the <gps.h> header file. */
+#undef HAVE_GPS_H
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
- declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
-
-/* 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 if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you have the 'long long' type. */
-#undef HAVE_LONG_LONG
-
-/* 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 if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* 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 `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
+/* Newer Cairo */
+#undef HAVE_NEWER_CAIRO
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
- uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
/* 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 `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 if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#undef HAVE_WINT_T
-
-/* 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 to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
-
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
+/* Directory of data files */
+#undef PACKAGE_DATA_DIR
+
+/* The package's locale path for gettext */
+#undef PACKAGE_LOCALE_DIR
+
/* Define to the full name of this package. */
#undef PACKAGE_NAME
+/* The source path */
+#undef PACKAGE_SOURCE_DIR
+
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
@@ -254,49 +84,8 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
- it. */
-#undef SIZE_MAX
-
-/* 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 to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define as the type of the result of subtracting two pointers, if the system
- doesn't define it. */
-#undef ptrdiff_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
- <inttypes.h> don't define. */
-#undef uintmax_t
--- NEW FILE: configure.ac ---
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(roadster, 0.2.0)
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
dnl AC_PROG_RANLIB
AC_PROG_LIBTOOL
AC_PROG_INTLTOOL
GNOME_DEBUG_CHECK
ALL_LINGUAS=""
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,,exit)
AC_SUBST(GNOME_LIBS)
AC_SUBST(GNOME_CFLAGS)
dnl ========= check for cairo ==================================================
dnl PKG_CHECK_MODULES(CAIRO, cairo,,exit)
PKG_CHECK_MODULES(CAIRO, cairo > 0.2.0,
[AC_DEFINE([HAVE_NEWER_CAIRO], [1], [Newer Cairo])],
[PKG_CHECK_MODULES(CAIRO, cairo,,exit)]
)
AC_SUBST(CAIRO_LIBS)
AC_SUBST(CAIRO_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)
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=""
else
AC_MSG_RESULT(no)
ROADSTER_DISABLE_DEPRECATED=""
fi
AC_SUBST(ROADSTER_DISABLE_DEPRECATED)
dnl ========= check for MySQL ==================================================
dnl AM_PATH_MYSQL([4.1.0], , AC_MSG_ERROR([MySQL >= 4.1.0 is required.]))
AC_ARG_WITH(mysql,
[ --with-mysql=<path> prefix of mysql installation.],
[ MYSQL_PREFIX=$with_mysql ],
[ MYSQL_PREFIX=/usr ])
AC_PATH_PROG(mysqlconfig,mysql_config,,[$PATH:$MYSQL_PREFIX/bin])
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 | sed -e \
's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'`
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=<path> 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])
dnl ========= output ===========================================================
AC_OUTPUT([
Makefile
data/Makefile
src/Makefile
pixmaps/Makefile
po/Makefile.in
data/roadster.desktop
])
More information about the cairo-commit
mailing list