diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index c81a4a8a..00000000 --- a/acconfig.h +++ /dev/null @@ -1,327 +0,0 @@ -/* acconfig.h - This file is in the public domain. - - Descriptive text for the C preprocessor macros that - the distributed Autoconf macros can define. - No software package will use all of them; autoheader copies the ones - your configure.in uses into your configuration header file templates. - - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). Although this order - can split up related entries, it makes it easier to check whether - a given entry is in the file. - - Leave the following blank line there!! Autoheader needs it. */ - - -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -#undef _ALL_SOURCE -#endif - -/* Define if using alloca.c. */ -#undef C_ALLOCA - -/* Define if type char is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -#undef __CHAR_UNSIGNED__ -#endif - -/* Define if the closedir function returns void instead of int. */ -#undef CLOSEDIR_VOID - -/* Define to empty if the keyword does not work. */ -#undef const - -/* 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 for DGUX with . */ -#undef DGUX - -/* Define if you have . */ -#undef DIRENT - -/* Define to enable audio support */ -#undef ENABLE_AUDIO_SUPPORT - -/* Define to enable GLUT joystick support (limited to 3 axes) */ -#undef ENABLE_GLUT_JOYSTICK - -/* Define to enable plib joystick support (recommended) */ -#undef ENABLE_PLIB_JOYSTICK - -/* Define to eliminate all trace of debugging messages such as for a - release build */ -#undef FG_NDEBUG - -/* Define to include Oliver's networking support */ -#undef FG_NETWORK_OLK - -/* Define to avoid Christian's new weather code */ -#undef FG_OLD_WEATHER - -/* Define if we are building FGFS (should always be defined) */ -#undef FGFS - -/* Define to enable 3dfx/glide render in a window hack under unix. - This probably won't work under windows. */ -#undef XMESA -#undef FX - -/* Define to the type of elements in the array set by `getgroups'. - Usually this is either `int' or `gid_t'. */ -#undef GETGROUPS_T - -/* Define if the `getloadavg' function needs to be run setuid or setgid. */ -#undef GETLOADAVG_PRIVILEGED - -/* Define if the `getpgrp' function takes no argument. */ -#undef GETPGRP_VOID - -/* Define to `int' if doesn't define. */ -#undef gid_t - -/* Define if you have alloca, as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define if you have and it should be used (not on Ultrix). */ -#undef HAVE_ALLOCA_H - -/* Define if you external variables daylight. */ -#undef HAVE_DAYLIGHT - -/* Define if you don't have vprintf but do have _doprnt. */ -#undef HAVE_DOPRNT - -/* Define if your system has a working fnmatch function. */ -#undef HAVE_FNMATCH - -/* Define if your system has its own `getloadavg' function. */ -#undef HAVE_GETLOADAVG - -/* Define if you have getrusage() */ -#undef HAVE_GETRUSAGE - -/* Define if you have the getmntent function. */ -#undef HAVE_GETMNTENT - -/* Define if you have the gpc library and headers installed. */ -#undef HAVE_GPC_H - -/* Define if the `long double' type works. */ -#undef HAVE_LONG_DOUBLE - -/* Define if you support file names longer than 14 characters. */ -#undef HAVE_LONG_FILE_NAMES - -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define if system calls automatically restart after interruption - by a signal. */ -#undef HAVE_RESTARTABLE_SYSCALLS - -/* Define if you have rint() which rounds to closest int but returns - result as a double data type. */ -#undef HAVE_RINT - -/* Define if your struct stat has st_blksize. */ -#undef HAVE_ST_BLKSIZE - -/* Define if your struct stat has st_blocks. */ -#undef HAVE_ST_BLOCKS - -/* Define if you have the strcoll function and it is properly defined. */ -#undef HAVE_STRCOLL - -/* Define if your struct stat has st_rdev. */ -#undef HAVE_ST_RDEV - -/* Define if you have the stdint.h include. */ -#undef HAVE_STDINT_H - -/* Define if you have the strftime function. */ -#undef HAVE_STRFTIME - -/* Define if you have */ -#undef HAVE_SYS_PARAM_H - -/* Define if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_STAT_H - -/* Define if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define if you have timegm() */ -#undef HAVE_TIMEGM - -/* Define if you external variables timezone. */ -#undef HAVE_TIMEZONE - -/* Define if your struct tm has tm_zone. */ -#undef HAVE_TM_ZONE - -/* Define if you don't have tm_zone but do have the external array - tzname. */ -#undef HAVE_TZNAME - -/* Define if you have . */ -#undef HAVE_UNISTD_H - -/* Define if utime(file, NULL) sets file's timestamp to the present. */ -#undef HAVE_UTIME_NULL - -/* Define if you have . */ -#undef HAVE_VFORK_H - -/* Define if you have the vprintf function. */ -#undef HAVE_VPRINTF - -/* Define if you have the wait3 system call. */ -#undef HAVE_WAIT3 - -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - -/* Define if int is 16 bits instead of 32. */ -#undef INT_16_BITS - -/* Define if long int is 64 bits. */ -#undef LONG_64_BITS - -/* Define if major, minor, and makedev are declared in . */ -#undef MAJOR_IN_MKDEV - -/* Define if major, minor, and makedev are declared in . */ -#undef MAJOR_IN_SYSMACROS - -/* Define if on MINIX. */ -#undef _MINIX - -/* Define to `int' if doesn't define. */ -#undef mode_t - -/* Define if you don't have , but have . */ -#undef NDIR - -/* Define if you have , and doesn't declare the - mem* functions. */ -#undef NEED_MEMORY_H - -/* Define if your struct nlist has an n_un member. */ -#undef NLIST_NAME_UNION - -/* Define if you have . */ -#undef NLIST_STRUCT - -/* Define if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Define to `long' if doesn't define. */ -#undef off_t - -/* Define to package name */ -#undef PACKAGE - -/* Define to `int' if doesn't define. */ -#undef pid_t - -/* Define if the system does not provide POSIX.1 features except - with this defined. */ -#undef _POSIX_1_SOURCE - -/* Define if you need to in order for stat and other things to work. */ -#undef _POSIX_SOURCE - -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE - -/* Define if the `setpgrp' function takes no argument. */ -#undef SETPGRP_VOID - -/* Define if the setvbuf function takes the buffering type as its second - argument and the buffer pointer as the third, as on System V - before release 3. */ -#undef SETVBUF_REVERSED - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* 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 if the `S_IS*' macros in do not work properly. */ -#undef STAT_MACROS_BROKEN - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define on System V Release 4. */ -#undef SVR4 - -/* Define if you don't have , but have . */ -#undef SYSDIR - -/* Define if you don't have , but have . */ -#undef SYSNDIR - -/* Define if `sys_siglist' is declared by . */ -#undef SYS_SIGLIST_DECLARED - -/* Define if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Define if your declares struct tm. */ -#undef TM_IN_SYS_TIME - -/* Define to `int' if doesn't define. */ -#undef uid_t - -/* Define for Encore UMAX. */ -#undef UMAX - -/* Define for Encore UMAX 4.3 that has - instead of . */ -#undef UMAX4_3 - -/* Define if you do not have , index, bzero, etc.. */ -#undef USG - -/* Define to version number */ -#undef VERSION - -/* Define vfork as fork if vfork does not work. */ -#undef vfork - -/* Define if the closedir function returns void instead of int. */ -#undef VOID_CLOSEDIR - -/* Define if compiling on a Winbloze (95, NT, etc.) platform */ -#undef WIN32 - -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#undef YYTEXT_POINTER - - -/* Leave that blank line there!! Autoheader needs it. - If you're adding to this file, keep in mind: - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). */ - diff --git a/configure.in b/configure.ac similarity index 95% rename from configure.in rename to configure.ac index cf7769c8..3fdc71ed 100644 --- a/configure.in +++ b/configure.ac @@ -5,8 +5,8 @@ dnl $Id$ AC_INIT(simgear/bucket/newbucket.cxx) -# Require at least automake 2.13 -AC_PREREQ(2.13) +# Require at least automake 2.53 +AC_PREREQ(2.53) dnl Initialize the automake stuff AM_INIT_AUTOMAKE(SimGear, 0.0.19pre1) @@ -63,7 +63,7 @@ AM_CONDITIONAL(OLD_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 15) # with_logging=yes AC_ARG_WITH(logging, [ --with-logging Include logging output (default)]) if test "x$with_logging" = "xno" ; then - AC_DEFINE(FG_NDEBUG) + AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output]) fi # Specify if we want to build with Norman's jpeg image server support. @@ -189,8 +189,8 @@ elif test "x$ac_cv_header_windows_h" != "xyes" ; then if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then AC_CHECK_HEADER(GL/fxmesa.h) if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then - AC_DEFINE(XMESA) - AC_DEFINE(FX) + AC_DEFINE([XMESA], 1, [Define for fxmesa]) + AC_DEFINE([FX], 1, [Define for fxmesa]) fi fi @@ -212,7 +212,7 @@ else dnl Win32 libs echo Win32 specific hacks... - AC_DEFINE(WIN32) + AC_DEFINE([WIN32], 1, [Define for Win32 platforms]) dnl force a failed check since we will be building under windoze AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes") @@ -280,6 +280,11 @@ if test "x$ac_cv_header_plib_pu_h" != "xyes"; then exit fi +AC_CHECK_HEADER(plib/ssgaLensFlare.h) +if test "x$ac_cv_header_plib_ssgaLensFlare_h" = "xyes"; then + AC_DEFINE([FG_CHEESY_LENS_FLARE], 1, [Define for cheesy lens flare effect]) +fi + dnl Check for system installed metakit AC_CHECK_HEADER(mk4.h) if test "x$ac_cv_header_mk4_h" != "xyes"; then @@ -308,7 +313,7 @@ AC_CHECK_HEADERS( \ sys/stat.h sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h ) if test "x$ac_cv_header_stdint_h" = "xyes"; then - AC_DEFINE(HAVE_STDINT_H) + AC_DEFINE([HAVE_STDINT_H], 1, [Define if stdint.h exists]) fi dnl Checks for typedefs, structures, and compiler characteristics.