Index: trunk/config.auto.h.in =================================================================== --- trunk/config.auto.h.in (revision 2577) +++ trunk/config.auto.h.in (nonexistent) @@ -1,179 +0,0 @@ -print [@ /***** Generated by scconfig - DO NOT EDIT *****/ - -/****************************************************************************/ -/* Static defines to enable extra features on some systems; once we get - testers on those systems, we can remove them and see if scconfig figured - everything. */ - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - -/****************************************************************************/ -/* Package properties */ - -/* Name of package */ -#define PACKAGE "pcb" - -/* Name of this program's gettext domain */ -#define GETTEXT_PACKAGE "pcb" - -/****************************************************************************/ -/* These ones are already autodetected by scconfig */ -@] - -print {\n\n/* Define to 1 if you have the `snprintf' function. */\n} -print_ternary libs/snprintf {#define HAVE_SNPRINTF 1} {/* #undef HAVE_SNPRINTF */} - -print {\n\n/* Define to 1 if you have the `vsnprintf' function. */\n} -print_ternary libs/vsnprintf {#define HAVE_VSNPRINTF 1} {/* #undef HAVE_VSNPRINTF */} - -print {\n\n/* Define to 1 if you have the `getcwd' function. */\n} -print_ternary libs/fs/getcwd/presents {#define HAVE_GETCWD 1} {/* #undef HAVE_GETCWD */} - -print {\n\n/* Define to 1 if you have the `_getcwd' function. */\n} -print_ternary ?libs/fs/_getcwd/presents {#define HAVE__GETCWD 1} {/* #undef HAVE__GETCWD */} - -print {\n\n/* Define to 1 if you have the `getwd' function. */\n} -print_ternary ?libs/fs/_getwd/presents {#define HAVE_GETWD 1} {/* #undef HAVE_GETWD */} - -print {\n\n/* Define to 1 if you have the header file. */\n} -print_ternary libs/gui/gd/presents {#define HAVE_GD_H 1} {/* #undef HAVE_GD_H */} - -print {\n\n/* Define to 1 if you have the `gdImageGif' function. */\n} -print_ternary libs/gui/gd/gdImageGif/presents {#define HAVE_GDIMAGEGIF 1} {/* #undef HAVE_GDIMAGEGIF */} - -print {\n\n/* Define to 1 if you have the `gdImageJpeg' function. */\n} -print_ternary libs/gui/gd/gdImageJpeg/presents {#define HAVE_GDIMAGEJPEG 1} {/* #undef HAVE_GDIMAGEJPEG */} - -print {\n\n/* Define to 1 if you have the `gdImagePng' function. */\n} -print_ternary libs/gui/gd/gdImagePng/presents {#define HAVE_GDIMAGEPNG 1} {/* #undef HAVE_GDIMAGEPNG */} - -print {\n\n/* Define to 1 if you have the `getpwuid' function. */\n} -print_ternary libs/userpass/getpwuid/presents {#define HAVE_GETPWUID 1} {/* #undef HAVE_GETPWUID */} - -print {\n\n/* Define to 1 if you have the `rint' function. */\n} -print_ternary libs/math/rint/presents {#define HAVE_RINT 1} {/* #undef HAVE_RINT */} - -print {\n\n/* Wrapper for S_ISLNK(x); always return 0 if S_ISLNK doesn't exist */\n} -switch ?/target/libs/fs/stat/macros/S_ISLNK - case {^$} print {#define WRAP_S_ISLNK(x) 0}; end; - default print [@#define WRAP_S_ISLNK(x) @/target/libs/fs/stat/macros/S_ISLNK@(x)@]; end; -end; - -print {\n\n/* Define to 1 if Xinerama is available */\n} -print_ternary libs/gui/xinerama/presents {#define HAVE_XINERAMA 1} {/*#undef HAVE_XINERAMA */} - -print {\n\n/* Define to 1 if Xrender is available */\n} -print_ternary libs/gui/xrender/presents {#define HAVE_XRENDER 1} {/*#undef HAVE_XRENDER */} - -print {\n\n/* Define to 1 if translation of program messages to the user's native language is requested. */\n} -print_ternary /local/pcb/want_nls {#define ENABLE_NLS 1} {/*#undef ENABLE_NLS */} - -print {\n\n/* Define to 1 if we should use windows api for dynamic linking. */\n} -print_ternary ?libs/LoadLibrary/presents {#define USE_LOADLIBRARY 1} {/* #undef USE_LOADLIBRARY */} - -print {\n\n/* Define to 1 if we should use mkdtemp for creating temp files. */\n} -print_ternary ?libs/fs/mkdtemp/presents {#define HAVE_MKDTEMP 1} {/* #undef HAVE_MKDTEMP */} - -print {\n\n/* Define to 1 if you have the `realpath' function. */\n} -print_ternary ?libs/fs/realpath/presents {#define HAVE_REALPATH 1} {/* #undef HAVE_REALPATH */} - -print {\n\n/* Select which mechanism to use for running child processes. */\n} -print_ternary ?/target/libs/proc/wait/presents {#define USE_FORK_WAIT 1} {/* #undef USE_FORK_WAIT */} -print {\n} -print_ternary ?/target/libs/proc/_spawnvp/presents {#define USE_SPAWNVP 1} {/* #undef USE_SPAWNVP */} - -print {\n\n/* Select which mechanism to use for creating a directory. */\n} -print_ternary ?/target/libs/fs/mkdir/presents {#define USE_MKDIR 1} {/* #undef USE_MKDIR */} -print {\n} -print_ternary ?/target/libs/fs/_mkdir/presents {#define USE__MKDIR 1} {/* #undef USE__MKDIR */} -print [@ -#define MKDIR_NUM_ARGS 0@?/target/libs/fs/_mkdir/num_args@@?/target/libs/fs/mkdir/num_args@ -@] - -print [@ - -/* The host "triplet" - it's really a pair now: machine-os */ -#define HOST "@sys/sysid@" - -/* Directory separator char */ -#define PCB_DIR_SEPARATOR_C '@sys/path_sep@' - -/* Directory separator string */ -#define PCB_DIR_SEPARATOR_S "@sys/path_sep@" - -/* Search path separator string */ -#define PCB_PATH_DELIMETER ":" - -/****************************************************************************/ -/* These are static; they are kept "just in case", for further porting */ - -/* C89 has atexit() */ -#define HAS_ATEXIT 1 - -/* C89 has this */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `canonicalize_file_name' function. - It's a GNU extension, assume we don't have it and fall back to - realpath() */ -/* #define HAVE_CANONICALIZE_FILE_NAME 1 */ -/* Define if canonicalize_file_name is not declared in system header files. */ -/* #undef NEED_DECLARATION_CANONICALIZE_FILE_NAME */ - -/****************************************************************************/ -/* Paths */ - -#define PCB_PREFIX "@/local/prefix@" -#define PCBSHAREDIR PCB_PREFIX "/share/pcb-rnd" -#define PCBLIBDIR PCB_PREFIX "/lib/pcb-rnd" - -#define BINDIR PCB_PREFIX "/bin" - -/* Relative path from bindir to exec_prefix */ -#define BINDIR_TO_EXECPREFIX ".." - -/* Version number of package */ -#define VERSION "@/local/version@" -#define REVISION "@/local/revision@" - - -/* Define to 1 if you have the `dmalloc' library (-ldmalloc); - (memory debugging without valgrind) */ -@] - -print_ternary libs/sul/dmalloc/presents {#define HAVE_LIBDMALLOC 1} {/*#undef HAVE_LIBDMALLOC */} - -print [@ -/* -The documentation says it's not necessary to include dmalloc.h. -Pros: getting source line info -Cons: can't include from here, needs to be included from the bottom of the #include list from each file -#ifdef HAVE_LIBDMALLOC -#include -#endif -*/ - -/* Coordinate type and properties, as detected by scconfig */ -typedef @/local/pcb/coord_type@ Coord; -#define COORD_MAX @/local/pcb/coord_max@ -#define coord_abs @/local/pcb/coord_abs@ - -/* the dot-dir: where to save user config under ther user's home; it's used - as ~/DOT_PCB_RND/ */ -#define DOT_PCB_RND "@/local/pcb/dot_pcb_rnd@" -@] Index: trunk/config.h =================================================================== --- trunk/config.h (revision 2577) +++ trunk/config.h (nonexistent) @@ -1,4 +0,0 @@ -#ifndef PCB_CONFIG_H -#define PCB_CONFIG_H -# include "config.auto.h" -#endif Index: trunk/config.h.in =================================================================== --- trunk/config.h.in (nonexistent) +++ trunk/config.h.in (revision 2578) @@ -0,0 +1,187 @@ +print [@ /***** Generated by scconfig - DO NOT EDIT *****/ + +/* Source: config.h.in; to regenerate run ./configure */ + +#ifndef PCB_CONFIG_H +#define PCB_CONFIG_H + +/****************************************************************************/ +/* Static defines to enable extra features on some systems; once we get + testers on those systems, we can remove them and see if scconfig figured + everything. */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + +/****************************************************************************/ +/* Package properties */ + +/* Name of package */ +#define PACKAGE "pcb" + +/* Name of this program's gettext domain */ +#define GETTEXT_PACKAGE "pcb" + +/****************************************************************************/ +/* These ones are already autodetected by scconfig */ +@] + +print {\n\n/* Define to 1 if you have the `snprintf' function. */\n} +print_ternary libs/snprintf {#define HAVE_SNPRINTF 1} {/* #undef HAVE_SNPRINTF */} + +print {\n\n/* Define to 1 if you have the `vsnprintf' function. */\n} +print_ternary libs/vsnprintf {#define HAVE_VSNPRINTF 1} {/* #undef HAVE_VSNPRINTF */} + +print {\n\n/* Define to 1 if you have the `getcwd' function. */\n} +print_ternary libs/fs/getcwd/presents {#define HAVE_GETCWD 1} {/* #undef HAVE_GETCWD */} + +print {\n\n/* Define to 1 if you have the `_getcwd' function. */\n} +print_ternary ?libs/fs/_getcwd/presents {#define HAVE__GETCWD 1} {/* #undef HAVE__GETCWD */} + +print {\n\n/* Define to 1 if you have the `getwd' function. */\n} +print_ternary ?libs/fs/_getwd/presents {#define HAVE_GETWD 1} {/* #undef HAVE_GETWD */} + +print {\n\n/* Define to 1 if you have the header file. */\n} +print_ternary libs/gui/gd/presents {#define HAVE_GD_H 1} {/* #undef HAVE_GD_H */} + +print {\n\n/* Define to 1 if you have the `gdImageGif' function. */\n} +print_ternary libs/gui/gd/gdImageGif/presents {#define HAVE_GDIMAGEGIF 1} {/* #undef HAVE_GDIMAGEGIF */} + +print {\n\n/* Define to 1 if you have the `gdImageJpeg' function. */\n} +print_ternary libs/gui/gd/gdImageJpeg/presents {#define HAVE_GDIMAGEJPEG 1} {/* #undef HAVE_GDIMAGEJPEG */} + +print {\n\n/* Define to 1 if you have the `gdImagePng' function. */\n} +print_ternary libs/gui/gd/gdImagePng/presents {#define HAVE_GDIMAGEPNG 1} {/* #undef HAVE_GDIMAGEPNG */} + +print {\n\n/* Define to 1 if you have the `getpwuid' function. */\n} +print_ternary libs/userpass/getpwuid/presents {#define HAVE_GETPWUID 1} {/* #undef HAVE_GETPWUID */} + +print {\n\n/* Define to 1 if you have the `rint' function. */\n} +print_ternary libs/math/rint/presents {#define HAVE_RINT 1} {/* #undef HAVE_RINT */} + +print {\n\n/* Wrapper for S_ISLNK(x); always return 0 if S_ISLNK doesn't exist */\n} +switch ?/target/libs/fs/stat/macros/S_ISLNK + case {^$} print {#define WRAP_S_ISLNK(x) 0}; end; + default print [@#define WRAP_S_ISLNK(x) @/target/libs/fs/stat/macros/S_ISLNK@(x)@]; end; +end; + +print {\n\n/* Define to 1 if Xinerama is available */\n} +print_ternary libs/gui/xinerama/presents {#define HAVE_XINERAMA 1} {/*#undef HAVE_XINERAMA */} + +print {\n\n/* Define to 1 if Xrender is available */\n} +print_ternary libs/gui/xrender/presents {#define HAVE_XRENDER 1} {/*#undef HAVE_XRENDER */} + +print {\n\n/* Define to 1 if translation of program messages to the user's native language is requested. */\n} +print_ternary /local/pcb/want_nls {#define ENABLE_NLS 1} {/*#undef ENABLE_NLS */} + +print {\n\n/* Define to 1 if we should use windows api for dynamic linking. */\n} +print_ternary ?libs/LoadLibrary/presents {#define USE_LOADLIBRARY 1} {/* #undef USE_LOADLIBRARY */} + +print {\n\n/* Define to 1 if we should use mkdtemp for creating temp files. */\n} +print_ternary ?libs/fs/mkdtemp/presents {#define HAVE_MKDTEMP 1} {/* #undef HAVE_MKDTEMP */} + +print {\n\n/* Define to 1 if you have the `realpath' function. */\n} +print_ternary ?libs/fs/realpath/presents {#define HAVE_REALPATH 1} {/* #undef HAVE_REALPATH */} + +print {\n\n/* Select which mechanism to use for running child processes. */\n} +print_ternary ?/target/libs/proc/wait/presents {#define USE_FORK_WAIT 1} {/* #undef USE_FORK_WAIT */} +print {\n} +print_ternary ?/target/libs/proc/_spawnvp/presents {#define USE_SPAWNVP 1} {/* #undef USE_SPAWNVP */} + +print {\n\n/* Select which mechanism to use for creating a directory. */\n} +print_ternary ?/target/libs/fs/mkdir/presents {#define USE_MKDIR 1} {/* #undef USE_MKDIR */} +print {\n} +print_ternary ?/target/libs/fs/_mkdir/presents {#define USE__MKDIR 1} {/* #undef USE__MKDIR */} +print [@ +#define MKDIR_NUM_ARGS 0@?/target/libs/fs/_mkdir/num_args@@?/target/libs/fs/mkdir/num_args@ +@] + +print [@ + +/* The host "triplet" - it's really a pair now: machine-os */ +#define HOST "@sys/sysid@" + +/* Directory separator char */ +#define PCB_DIR_SEPARATOR_C '@sys/path_sep@' + +/* Directory separator string */ +#define PCB_DIR_SEPARATOR_S "@sys/path_sep@" + +/* Search path separator string */ +#define PCB_PATH_DELIMETER ":" + +/****************************************************************************/ +/* These are static; they are kept "just in case", for further porting */ + +/* C89 has atexit() */ +#define HAS_ATEXIT 1 + +/* C89 has this */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `canonicalize_file_name' function. + It's a GNU extension, assume we don't have it and fall back to + realpath() */ +/* #define HAVE_CANONICALIZE_FILE_NAME 1 */ +/* Define if canonicalize_file_name is not declared in system header files. */ +/* #undef NEED_DECLARATION_CANONICALIZE_FILE_NAME */ + +/****************************************************************************/ +/* Paths */ + +#define PCB_PREFIX "@/local/prefix@" +#define PCBSHAREDIR PCB_PREFIX "/share/pcb-rnd" +#define PCBLIBDIR PCB_PREFIX "/lib/pcb-rnd" + +#define BINDIR PCB_PREFIX "/bin" + +/* Relative path from bindir to exec_prefix */ +#define BINDIR_TO_EXECPREFIX ".." + +/* Version number of package */ +#define VERSION "@/local/version@" +#define REVISION "@/local/revision@" + + +/* Define to 1 if you have the `dmalloc' library (-ldmalloc); + (memory debugging without valgrind) */ +@] + +print_ternary libs/sul/dmalloc/presents {#define HAVE_LIBDMALLOC 1} {/*#undef HAVE_LIBDMALLOC */} + +print [@ +/* +The documentation says it's not necessary to include dmalloc.h. +Pros: getting source line info +Cons: can't include from here, needs to be included from the bottom of the #include list from each file +#ifdef HAVE_LIBDMALLOC +#include +#endif +*/ + +/* Coordinate type and properties, as detected by scconfig */ +typedef @/local/pcb/coord_type@ Coord; +#define COORD_MAX @/local/pcb/coord_max@ +#define coord_abs @/local/pcb/coord_abs@ + +/* the dot-dir: where to save user config under ther user's home; it's used + as ~/DOT_PCB_RND/ */ +#define DOT_PCB_RND "@/local/pcb/dot_pcb_rnd@" + + +#endif +@] Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 2577) +++ trunk/scconfig/hooks.c (revision 2578) @@ -506,7 +506,7 @@ printf("Generating util/gsch2pcb-rnd/Makefile (%d)\n", generr |= tmpasm("../util", "gsch2pcb-rnd/Makefile.in", "gsch2pcb-rnd/Makefile")); - printf("Generating config.auto.h (%d)\n", generr |= tmpasm("..", "config.auto.h.in", "config.auto.h")); + printf("Generating config.h (%d)\n", generr |= tmpasm("..", "config.h.in", "config.h")); printf("Generating compat_inc.h (%d)\n", generr |= tmpasm("../src", "compat_inc.h.in", "compat_inc.h"));