Index: trunk/config.h.in =================================================================== --- trunk/config.h.in (revision 29286) +++ trunk/config.h.in (revision 29287) @@ -5,28 +5,8 @@ #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. */ +#include -/* 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 */ @@ -37,133 +17,6 @@ /* These ones are already autodetected by scconfig */ @] -print {\n\n/* Macro to add a funciton attribute to suppress "function unused" for static inline functions declared in .h files */\n} -print_ternary ?cc/func_attr/unused/presents {#define PCB_FUNC_UNUSED __attribute__((unused))} {#define PCB_FUNC_UNUSED} - -print {\n\n/* inline, as detected ("inline" or empty) */\n} -print_ternary ?cc/inline {#define PCB_INLINE_DETECTED inline} {#define PCB_INLINE_DETECTED /* no inline */} - -print {\n\n/* final, combined keywords and attributes for an inline function */\n} -print {#define PCB_INLINE static PCB_INLINE_DETECTED PCB_FUNC_UNUSED\n\n} - -print {\n\n/* Wether setenv() works */\n} -print_ternary ?libs/env/setenv/presents {#define PCB_HAVE_SETENV 1} {/* #undef PCB_HAVE_SETENV */} - -print {\n\n/* Wether putenv() works */\n} -print_ternary ?libs/env/putenv/presents {#define PCB_HAVE_PUTENV 1} {/* #undef PCB_HAVE_PUTENV */} - -print {\n\n/* Wether usleep() works */\n} -print_ternary ?libs/time/usleep/presents {#define PCB_HAVE_USLEEP 1} {/* #undef PCB_HAVE_USLEEP */} - -print {\n\n/* Wether win32 Sleep() works */\n} -print_ternary ?libs/time/Sleep/presents {#define PCB_HAVE_WSLEEP 1} {/* #undef PCB_HAVE_WSLEEP */} - -print {\n\n/* Wether select() works */\n} -print_ternary ?libs/socket/select/presents {#define PCB_HAVE_SELECT 1} {/* #undef PCB_HAVE_SELECT */} - -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 `gdImageSetResolution' function. */\n} -print_ternary ?libs/gui/gd/gdImageSetResolution/presents {#define HAVE_GD_RESOLUTION 1} {/* #undef HAVE_GD_RESOLUTION */} - -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/* Define to 1 if you have the `round' function. */\n} -print_ternary ?libs/math/round/presents {#define HAVE_ROUND 1} {/* #undef HAVE_ROUND */} - -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 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 {\n\n/* Define whether we have specific signals. */\n} -print_ternary ?signal/names/SIGPIPE/presents {#define PCB_HAVE_SIGPIPE 1} {/* #undef PCB_HAVE_SIGPIPE */} -print {\n} -print_ternary ?signal/names/SIGSEGV/presents {#define PCB_HAVE_SIGSEGV 1} {/* #undef PCB_HAVE_SIGSEGV */} -print {\n} -print_ternary ?signal/names/SIGABRT/presents {#define PCB_HAVE_SIGABRT 1} {/* #undef PCB_HAVE_SIGABRT */} -print {\n} -print_ternary ?signal/names/SIGINT/presents {#define PCB_HAVE_SIGINT 1} {/* #undef PCB_HAVE_SIGINT */} -print {\n} -print_ternary ?signal/names/SIGHUP/presents {#define PCB_HAVE_SIGHUP 1} {/* #undef PCB_HAVE_SIGHUP */} -print {\n} -print_ternary ?signal/names/SIGTERM/presents {#define PCB_HAVE_SIGTERM 1} {/* #undef PCB_HAVE_SIGTERM */} -print {\n} -print_ternary ?signal/names/SIGQUIT/presents {#define PCB_HAVE_SIGQUIT 1} {/* #undef PCB_HAVE_SIGQUIT */} -print {\n} - -print {\n\n/* Wether fungw is system installed */\n} -print_ternary /local/pcb/fungw_system {#define PCB_HAVE_SYS_FUNGW 1} {/* #undef PCB_HAVE_SYS_FUNGW */} - -print {\n/* Code warnings for TODO, portable (unlike #warning) */} -if ?cc/pragma_message -then -print [@ -#define DO_PRAGMA(arg) _Pragma(#arg) -#define TODO(x) DO_PRAGMA(message("TODO: " #x)) -@] -else -print {\n/* Not available */\n#define TODO(x)\n} -end - # calculate the /local/confdir: either specified conf-time or compatibility fallback switch /local/confdir case {^$} put /local/confdir_final {PCBSHAREDIR}; end @@ -171,36 +24,7 @@ end 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_escaped@' - -/* Directory separator string */ -#define PCB_DIR_SEPARATOR_S "@sys/path_sep_escaped@" - -/* 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 */ @] @@ -234,82 +58,10 @@ #define PCB_VERSION "@/local/version@" #define PCB_REVISION "@/local/revision@" -/* Format: abccrrrrr where a, b and c are pcb-rnd version numbers and r is - the svn revision number (optional) */ -#define PCB_API_VER @/local/apiver@ - - -/* 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 -*/ - -@?/local/pcb/include_stdint@ - -/* Coordinate type and properties, as detected by scconfig */ -typedef @/local/pcb/coord_type@ pcb_coord_t; -#define COORD_MAX @/local/pcb/coord_max@ -#define coord_abs pcb_coord_abs - -/* Other autodetected types */ -typedef @/local/pcb/long64@ pcb_long64_t; - /* 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@" -/* gtk */ -#define PCB_GTK_KEY(keyname) (@?libs/gui/gtk2/key_prefix@ ## keyname) - -/* ./configure --workaround requests: */ -@?/local/pcb/workaround_defs@ - -/* Make sure to catch usage of non-portable functions in debug mode - This is in here only because config.h should be included from every source - file. */ -#ifndef NDEBUG -# undef strdup -# undef strndup -# undef snprintf -# undef round -# undef strcasecmp -# define strdup never_use_strdup__use_pcb_strdup -# define strndup never_use_strndup__use_pcb_strndup -# define snprintf never_use_snprintf__use_pcb_snprintf -# define round never_use_round__use_pcb_round -# define strcasecmp never_use_strcasecmp__use_pcb_strcasecmp -# ifndef PCB_SAFE_FS -# undef fopen -# undef popen -# undef system -# undef remove -# undef rename -# define fopen never_use_fopen__use_pcb_fopen -# define popen never_use_popen__use_pcb_popen -# define system never_use_system__use_pcb_system -# define remove never_use_remove__use_pcb_remove -# define rename never_use_rename__use_pcb_rename -# define mkdir never_use_mkdir__use_pcb_mkdir -# define unlink never_use_unlink__use_pcb_unlink -# define opendir never_use_opendir__use_pcb_opendir -# define readdir never_use_readdir__use_pcb_readdir -# define closedir never_use_closedir__use_pcb_closedir -# define access never_use_access__use_pcb_file_readable -# endif - #endif - -#endif @] Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 29286) +++ trunk/scconfig/hooks.c (revision 29287) @@ -968,7 +968,8 @@ printf("Generating util/gsch2pcb-rnd/Makefile (%d)\n", generr |= tmpasm("../util", "gsch2pcb-rnd/Makefile.in", "gsch2pcb-rnd/Makefile")); - printf("Generating config.h (%d)\n", generr |= tmpasm("..", "config.h.in", "config.h")); + printf("Generating librnd config.h (%d)\n", generr |= tmpasm("../src/librnd", "config.h.in", "config.h")); + printf("Generating pcb-rnd config.h (%d)\n", generr |= tmpasm("..", "config.h.in", "config.h")); printf("Generating compat_inc.h (%d)\n", generr |= tmpasm("../src/librnd/core", "compat_inc.h.in", "compat_inc.h")); Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 29286) +++ trunk/src/Makefile.in (revision 29287) @@ -608,7 +608,7 @@ # rndlib: corner case: some headers are not derived from the objects sub /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/hid_dlg.h } {} sub /local/pcb/HDRS_HIDLIB {polygon1.h } {} -append /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/hid.h $(LIBRND)/core/global_typedefs.h $(LIBRND)/core/globalconst.h $(LIBRND)/core/math_helper.h $(LIBRND)/core/buildin.hidlib.h $(LIBRND)/core/hid_inlines.h $(LIBRND)/core/rotate.h $(LIBRND)/core/fptr_cast.h $(LIBRND)/core/safe_fs_dir.h $(LIBRND)/core/compat_inc.h } +append /local/pcb/HDRS_HIDLIB {$(LIBRND)/config.h $(LIBRND)/core/hid.h $(LIBRND)/core/global_typedefs.h $(LIBRND)/core/globalconst.h $(LIBRND)/core/math_helper.h $(LIBRND)/core/buildin.hidlib.h $(LIBRND)/core/hid_inlines.h $(LIBRND)/core/rotate.h $(LIBRND)/core/fptr_cast.h $(LIBRND)/core/safe_fs_dir.h $(LIBRND)/core/compat_inc.h } gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/dom_[^ ]*.h } {} gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/tree_[^ ]*.h } {} gsub /local/pcb/HDRS_3RDLIB {../src_3rd/libfungw/fungw_ptr.h ../src_3rd/libfungw/fungw_debug.h ../src_3rd/libfungw/fungw_call.h } {} Index: trunk/src/librnd/config.h.in =================================================================== --- trunk/src/librnd/config.h.in (nonexistent) +++ trunk/src/librnd/config.h.in (revision 29287) @@ -0,0 +1,265 @@ +print [@ /***** Generated by scconfig - DO NOT EDIT *****/ + +/* Source: config.h.in; to regenerate run ./configure */ + +#ifndef RND_CONFIG_H +#define RND_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 + +/****************************************************************************/ +/* These ones are already autodetected by scconfig */ +@] + +print {\n\n/* Macro to add a funciton attribute to suppress "function unused" for static inline functions declared in .h files */\n} +print_ternary ?cc/func_attr/unused/presents {#define PCB_FUNC_UNUSED __attribute__((unused))} {#define PCB_FUNC_UNUSED} + +print {\n\n/* inline, as detected ("inline" or empty) */\n} +print_ternary ?cc/inline {#define PCB_INLINE_DETECTED inline} {#define PCB_INLINE_DETECTED /* no inline */} + +print {\n\n/* final, combined keywords and attributes for an inline function */\n} +print {#define PCB_INLINE static PCB_INLINE_DETECTED PCB_FUNC_UNUSED\n\n} + +print {\n\n/* Wether setenv() works */\n} +print_ternary ?libs/env/setenv/presents {#define PCB_HAVE_SETENV 1} {/* #undef PCB_HAVE_SETENV */} + +print {\n\n/* Wether putenv() works */\n} +print_ternary ?libs/env/putenv/presents {#define PCB_HAVE_PUTENV 1} {/* #undef PCB_HAVE_PUTENV */} + +print {\n\n/* Wether usleep() works */\n} +print_ternary ?libs/time/usleep/presents {#define PCB_HAVE_USLEEP 1} {/* #undef PCB_HAVE_USLEEP */} + +print {\n\n/* Wether win32 Sleep() works */\n} +print_ternary ?libs/time/Sleep/presents {#define PCB_HAVE_WSLEEP 1} {/* #undef PCB_HAVE_WSLEEP */} + +print {\n\n/* Wether select() works */\n} +print_ternary ?libs/socket/select/presents {#define PCB_HAVE_SELECT 1} {/* #undef PCB_HAVE_SELECT */} + +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 `gdImageSetResolution' function. */\n} +print_ternary ?libs/gui/gd/gdImageSetResolution/presents {#define HAVE_GD_RESOLUTION 1} {/* #undef HAVE_GD_RESOLUTION */} + +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/* Define to 1 if you have the `round' function. */\n} +print_ternary ?libs/math/round/presents {#define HAVE_ROUND 1} {/* #undef HAVE_ROUND */} + +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 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 {\n\n/* Define whether we have specific signals. */\n} +print_ternary ?signal/names/SIGPIPE/presents {#define PCB_HAVE_SIGPIPE 1} {/* #undef PCB_HAVE_SIGPIPE */} +print {\n} +print_ternary ?signal/names/SIGSEGV/presents {#define PCB_HAVE_SIGSEGV 1} {/* #undef PCB_HAVE_SIGSEGV */} +print {\n} +print_ternary ?signal/names/SIGABRT/presents {#define PCB_HAVE_SIGABRT 1} {/* #undef PCB_HAVE_SIGABRT */} +print {\n} +print_ternary ?signal/names/SIGINT/presents {#define PCB_HAVE_SIGINT 1} {/* #undef PCB_HAVE_SIGINT */} +print {\n} +print_ternary ?signal/names/SIGHUP/presents {#define PCB_HAVE_SIGHUP 1} {/* #undef PCB_HAVE_SIGHUP */} +print {\n} +print_ternary ?signal/names/SIGTERM/presents {#define PCB_HAVE_SIGTERM 1} {/* #undef PCB_HAVE_SIGTERM */} +print {\n} +print_ternary ?signal/names/SIGQUIT/presents {#define PCB_HAVE_SIGQUIT 1} {/* #undef PCB_HAVE_SIGQUIT */} +print {\n} + +print {\n\n/* Wether fungw is system installed */\n} +print_ternary /local/pcb/fungw_system {#define PCB_HAVE_SYS_FUNGW 1} {/* #undef PCB_HAVE_SYS_FUNGW */} + +print {\n/* Code warnings for TODO, portable (unlike #warning) */} +if ?cc/pragma_message +then +print [@ +#define DO_PRAGMA(arg) _Pragma(#arg) +#define TODO(x) DO_PRAGMA(message("TODO: " #x)) +@] +else +print {\n/* Not available */\n#define TODO(x)\n} +end + +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_escaped@' + +/* Directory separator string */ +#define PCB_DIR_SEPARATOR_S "@sys/path_sep_escaped@" + +/* 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 */ + +/* Format: abccrrrrr where a, b and c are pcb-rnd version numbers and r is + the svn revision number (optional) */ +#define PCB_API_VER @/local/apiver@ + + +/* 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 +*/ + +@?/local/pcb/include_stdint@ + +/* Coordinate type and properties, as detected by scconfig */ +typedef @/local/pcb/coord_type@ pcb_coord_t; +#define COORD_MAX @/local/pcb/coord_max@ +#define coord_abs pcb_coord_abs + +/* Other autodetected types */ +typedef @/local/pcb/long64@ pcb_long64_t; + +/* gtk */ +#define PCB_GTK_KEY(keyname) (@?libs/gui/gtk2/key_prefix@ ## keyname) + + +/* ./configure --workaround requests: */ +@?/local/pcb/workaround_defs@ + +/* Make sure to catch usage of non-portable functions in debug mode + This is in here only because config.h should be included from every source + file. */ +#ifndef NDEBUG +# undef strdup +# undef strndup +# undef snprintf +# undef round +# undef strcasecmp +# define strdup never_use_strdup__use_pcb_strdup +# define strndup never_use_strndup__use_pcb_strndup +# define snprintf never_use_snprintf__use_pcb_snprintf +# define round never_use_round__use_pcb_round +# define strcasecmp never_use_strcasecmp__use_pcb_strcasecmp +# ifndef PCB_SAFE_FS +# undef fopen +# undef popen +# undef system +# undef remove +# undef rename +# define fopen never_use_fopen__use_pcb_fopen +# define popen never_use_popen__use_pcb_popen +# define system never_use_system__use_pcb_system +# define remove never_use_remove__use_pcb_remove +# define rename never_use_rename__use_pcb_rename +# define mkdir never_use_mkdir__use_pcb_mkdir +# define unlink never_use_unlink__use_pcb_unlink +# define opendir never_use_opendir__use_pcb_opendir +# define readdir never_use_readdir__use_pcb_readdir +# define closedir never_use_closedir__use_pcb_closedir +# define access never_use_access__use_pcb_file_readable +# endif + +#endif + +#endif +@] Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 29286) +++ trunk/src/librnd/core/actions.c (revision 29287) @@ -28,7 +28,7 @@ * */ -#include "config.h" +#include #include Index: trunk/src/librnd/core/attrib.c =================================================================== --- trunk/src/librnd/core/attrib.c (revision 29286) +++ trunk/src/librnd/core/attrib.c (revision 29287) @@ -31,7 +31,7 @@ #include #include #include -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/box.c =================================================================== --- trunk/src/librnd/core/box.c (revision 29286) +++ trunk/src/librnd/core/box.c (revision 29287) @@ -27,7 +27,7 @@ * */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/box.h =================================================================== --- trunk/src/librnd/core/box.h (revision 29286) +++ trunk/src/librnd/core/box.h (revision 29287) @@ -44,7 +44,7 @@ #define PCB_BOX_H #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/color.c =================================================================== --- trunk/src/librnd/core/color.c (revision 29286) +++ trunk/src/librnd/core/color.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/compat_fs.c =================================================================== --- trunk/src/librnd/core/compat_fs.c (revision 29286) +++ trunk/src/librnd/core/compat_fs.c (revision 29287) @@ -30,7 +30,7 @@ /* misc functions used by several modules */ #define PCB_SAFE_FS -#include "config.h" +#include #include Index: trunk/src/librnd/core/compat_lrealpath.c =================================================================== --- trunk/src/librnd/core/compat_lrealpath.c (revision 29286) +++ trunk/src/librnd/core/compat_lrealpath.c (revision 29287) @@ -34,7 +34,7 @@ */ #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/compat_misc.c =================================================================== --- trunk/src/librnd/core/compat_misc.c (revision 29286) +++ trunk/src/librnd/core/compat_misc.c (revision 29287) @@ -26,7 +26,7 @@ */ #include -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/compat_misc.h =================================================================== --- trunk/src/librnd/core/compat_misc.h (revision 29286) +++ trunk/src/librnd/core/compat_misc.h (revision 29287) @@ -28,7 +28,7 @@ #ifndef PCB_COMPAT_MISC_H #define PCB_COMPAT_MISC_H -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 29286) +++ trunk/src/librnd/core/conf.c (revision 29287) @@ -31,7 +31,7 @@ #include #include #include -#include "config.h" +#include #include #include "conf_core.h" #include Index: trunk/src/librnd/core/conf.h =================================================================== --- trunk/src/librnd/core/conf.h (revision 29286) +++ trunk/src/librnd/core/conf.h (revision 29287) @@ -26,7 +26,7 @@ #ifndef PCB_CONF_H #define PCB_CONF_H -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/conf_hid.c =================================================================== --- trunk/src/librnd/core/conf_hid.c (revision 29286) +++ trunk/src/librnd/core/conf_hid.c (revision 29287) @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 29286) +++ trunk/src/librnd/core/error.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/event.c =================================================================== --- trunk/src/librnd/core/event.c (revision 29286) +++ trunk/src/librnd/core/event.c (revision 29287) @@ -27,7 +27,7 @@ #include #include #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/event.h =================================================================== --- trunk/src/librnd/core/event.h (revision 29286) +++ trunk/src/librnd/core/event.h (revision 29287) @@ -26,7 +26,7 @@ #ifndef PCB_EVENT_H #define PCB_EVENT_H -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/file_loaded.c =================================================================== --- trunk/src/librnd/core/file_loaded.c (revision 29286) +++ trunk/src/librnd/core/file_loaded.c (revision 29287) @@ -26,7 +26,7 @@ * */ -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/fptr_cast.c =================================================================== --- trunk/src/librnd/core/fptr_cast.c (revision 29286) +++ trunk/src/librnd/core/fptr_cast.c (revision 29287) @@ -25,7 +25,7 @@ */ #include -#include "config.h" +#include #include void *pcb_cast_f2d(pcb_fptr_t f) Index: trunk/src/librnd/core/funchash.c =================================================================== --- trunk/src/librnd/core/funchash.c (revision 29286) +++ trunk/src/librnd/core/funchash.c (revision 29287) @@ -30,7 +30,7 @@ #include #include #include "funchash_core.h" -#include "config.h" +#include #include "macro.h" #include Index: trunk/src/librnd/core/global_typedefs.h =================================================================== --- trunk/src/librnd/core/global_typedefs.h (revision 29286) +++ trunk/src/librnd/core/global_typedefs.h (revision 29287) @@ -27,7 +27,7 @@ #ifndef GLOBAL_TYPEDEFS_H #define GLOBAL_TYPEDEFS_H -#include "config.h" +#include struct pcb_box_s { /* a bounding box */ pcb_coord_t X1, Y1; /* upper left */ Index: trunk/src/librnd/core/globalconst.h =================================================================== --- trunk/src/librnd/core/globalconst.h (revision 29286) +++ trunk/src/librnd/core/globalconst.h (revision 29287) @@ -29,7 +29,7 @@ #ifndef PCB_GLOBALCONST_H #define PCB_GLOBALCONST_H -#include "config.h" +#include #define PCB_LARGE_VALUE (COORD_MAX / 2 - 1) /* maximum extent of board and elements */ Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 29286) +++ trunk/src/librnd/core/grid.c (revision 29287) @@ -28,7 +28,7 @@ * */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/heap.c =================================================================== --- trunk/src/librnd/core/heap.c (revision 29286) +++ trunk/src/librnd/core/heap.c (revision 29287) @@ -40,7 +40,7 @@ #include #include -#include "config.h" +#include #include /* define this for more thorough self-checking of data structures */ Index: trunk/src/librnd/core/heap.h =================================================================== --- trunk/src/librnd/core/heap.h (revision 29286) +++ trunk/src/librnd/core/heap.h (revision 29287) @@ -40,7 +40,7 @@ #ifndef PCB_HEAP_H #define PCB_HEAP_H -#include "config.h" +#include /* type of heap costs */ typedef double pcb_cost_t; Index: trunk/src/librnd/core/hid.h =================================================================== --- trunk/src/librnd/core/hid.h (revision 29286) +++ trunk/src/librnd/core/hid.h (revision 29287) @@ -4,7 +4,7 @@ #include #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 29286) +++ trunk/src/librnd/core/hid_attrib.c (revision 29287) @@ -28,7 +28,7 @@ * */ -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 29286) +++ trunk/src/librnd/core/hid_cfg.c (revision 29287) @@ -31,7 +31,7 @@ #include #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/hid_cfg_action.c =================================================================== --- trunk/src/librnd/core/hid_cfg_action.c (revision 29286) +++ trunk/src/librnd/core/hid_cfg_action.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/hid_cfg_input.c =================================================================== --- trunk/src/librnd/core/hid_cfg_input.c (revision 29286) +++ trunk/src/librnd/core/hid_cfg_input.c (revision 29287) @@ -33,7 +33,7 @@ #include #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/hid_dad.c =================================================================== --- trunk/src/librnd/core/hid_dad.c (revision 29286) +++ trunk/src/librnd/core/hid_dad.c (revision 29287) @@ -26,7 +26,7 @@ /* widget-type-independent DAD functions */ -#include "config.h" +#include #include int pcb_dock_is_vert[PCB_HID_DOCK_max] = {0, 0, 0, 1, 0, 1}; /* Update this if pcb_hid_dock_t changes */ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 29286) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 29287) @@ -26,7 +26,7 @@ /* Compound DAD widget for numeric value entry, creating a spinbox */ -#include "config.h" +#include #include Index: trunk/src/librnd/core/hid_dad_tree.c =================================================================== --- trunk/src/librnd/core/hid_dad_tree.c (revision 29286) +++ trunk/src/librnd/core/hid_dad_tree.c (revision 29287) @@ -26,7 +26,7 @@ /* Non-inline utility functions for the DAD tree widget */ -#include "config.h" +#include #include /* recursively free a row list subtree */ Index: trunk/src/librnd/core/hid_dad_unit.c =================================================================== --- trunk/src/librnd/core/hid_dad_unit.c (revision 29286) +++ trunk/src/librnd/core/hid_dad_unit.c (revision 29287) @@ -26,7 +26,7 @@ /* Compound DAD widget for numeric value entry, creating a spinbox */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 29286) +++ trunk/src/librnd/core/hid_dlg.c (revision 29287) @@ -27,7 +27,7 @@ * */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 29286) +++ trunk/src/librnd/core/hid_init.c (revision 29287) @@ -28,7 +28,7 @@ * */ -#include "config.h" +#include #include #include @@ -60,6 +60,9 @@ #include #include +char *pcbhl_conf_dot_dir = ".librnd"; +char *pcbhl_conf_lib_dir = "/usr/lib/librnd"; + static const char *flt_any[] = {"*", "*.*", NULL}; const pcb_hid_fsd_filter_t pcb_hid_fsd_filter_any[] = { @@ -95,20 +98,20 @@ free(tmp); /* hardwired libdir, just in case exec-prefix goes wrong (e.g. linstall) */ - tmp = pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); + tmp = pcb_concat(pcbhl_conf_lib_dir, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); pcb_plugin_add_dir(tmp); free(tmp); - tmp = pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S, "plugins", NULL); + tmp = pcb_concat(pcbhl_conf_lib_dir, PCB_DIR_SEPARATOR_S, "plugins", NULL); pcb_plugin_add_dir(tmp); free(tmp); /* pcbhl_conf.rc.path.home is set by the conf_core immediately on startup */ if (pcbhl_conf.rc.path.home != NULL) { - tmp = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, DOT_PCB_RND, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); + tmp = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, pcbhl_conf_dot_dir, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); pcb_plugin_add_dir(tmp); free(tmp); - tmp = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, DOT_PCB_RND, PCB_DIR_SEPARATOR_S, "plugins", NULL); + tmp = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, pcbhl_conf_dot_dir, PCB_DIR_SEPARATOR_S, "plugins", NULL); pcb_plugin_add_dir(tmp); free(tmp); } Index: trunk/src/librnd/core/hid_init.h =================================================================== --- trunk/src/librnd/core/hid_init.h (revision 29286) +++ trunk/src/librnd/core/hid_init.h (revision 29287) @@ -94,7 +94,10 @@ else it is the full file name */ const char *pcb_hid_export_fn(const char *filename); +/* Config directories the caller needs to load before the conf system is initialized */ +extern char *pcbhl_conf_dot_dir, *pcbhl_conf_lib_dir; + /*** main(), initialize ***/ typedef struct { Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 29286) +++ trunk/src/librnd/core/hid_nogui.c (revision 29287) @@ -28,7 +28,7 @@ * */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/hidlib.c =================================================================== --- trunk/src/librnd/core/hidlib.c (revision 29286) +++ trunk/src/librnd/core/hidlib.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include "tool.h" Index: trunk/src/librnd/core/hidlib_conf.c =================================================================== --- trunk/src/librnd/core/hidlib_conf.c (revision 29286) +++ trunk/src/librnd/core/hidlib_conf.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/misc_util.c =================================================================== --- trunk/src/librnd/core/misc_util.c (revision 29286) +++ trunk/src/librnd/core/misc_util.c (revision 29287) @@ -29,7 +29,7 @@ /* misc functions used by several modules */ -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/paths.c =================================================================== --- trunk/src/librnd/core/paths.c (revision 29286) +++ trunk/src/librnd/core/paths.c (revision 29287) @@ -28,7 +28,7 @@ #include #include #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/pcb-printf.c =================================================================== --- trunk/src/librnd/core/pcb-printf.c (revision 29286) +++ trunk/src/librnd/core/pcb-printf.c (revision 29287) @@ -39,7 +39,7 @@ #include #include #include -#include "config.h" +#include #include const char *pcb_printf_slot[PCB_PRINTF_SLOT_max] = Index: trunk/src/librnd/core/pcb_bool.c =================================================================== --- trunk/src/librnd/core/pcb_bool.c (revision 29286) +++ trunk/src/librnd/core/pcb_bool.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/pixmap.c =================================================================== --- trunk/src/librnd/core/pixmap.c (revision 29286) +++ trunk/src/librnd/core/pixmap.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/plugins.c =================================================================== --- trunk/src/librnd/core/plugins.c (revision 29286) +++ trunk/src/librnd/core/plugins.c (revision 29287) @@ -29,7 +29,7 @@ #include /* for the action */ -#include "config.h" +#include #include "genvector/gds_char.h" #include #include Index: trunk/src/librnd/core/rotate.h =================================================================== --- trunk/src/librnd/core/rotate.h (revision 29286) +++ trunk/src/librnd/core/rotate.h (revision 29287) @@ -29,7 +29,7 @@ #ifndef RND_ROTATE_H #define RND_ROTATE_H -#include "config.h" +#include #include #include Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 29286) +++ trunk/src/librnd/core/safe_fs.c (revision 29287) @@ -30,7 +30,7 @@ /* opendir, readdir */ #include -#include "config.h" +#include #include Index: trunk/src/librnd/core/unit.c =================================================================== --- trunk/src/librnd/core/unit.c (revision 29286) +++ trunk/src/librnd/core/unit.c (revision 29287) @@ -31,7 +31,7 @@ * asp11@sfu.ca * */ -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/core/vtc0.h =================================================================== --- trunk/src/librnd/core/vtc0.h (revision 29286) +++ trunk/src/librnd/core/vtc0.h (revision 29287) @@ -1,7 +1,7 @@ #ifndef VTC0_H #define VTC0_H -#include "config.h" +#include #include #include Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 29286) +++ trunk/src/librnd/poly/polyarea.c (revision 29287) @@ -45,7 +45,7 @@ #include #include -#include "config.h" +#include #include #include #include Index: trunk/src/librnd/poly/polygon1_gen.c =================================================================== --- trunk/src/librnd/poly/polygon1_gen.c (revision 29286) +++ trunk/src/librnd/poly/polygon1_gen.c (revision 29287) @@ -26,7 +26,7 @@ * */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/poly/rtree.c =================================================================== --- trunk/src/librnd/poly/rtree.c (revision 29286) +++ trunk/src/librnd/poly/rtree.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include Index: trunk/src/librnd/poly/self_isc.c =================================================================== --- trunk/src/librnd/poly/self_isc.c (revision 29286) +++ trunk/src/librnd/poly/self_isc.c (revision 29287) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "config.h" +#include #include #include #include Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 29286) +++ trunk/src/main.c (revision 29287) @@ -347,6 +347,9 @@ pcbhl_main_args_t ga; + pcbhl_conf_dot_dir = DOT_PCB_RND; + pcbhl_conf_lib_dir = PCBLIBDIR; + pcb_fix_locale_and_env(); exec_prefix = main_path_init(argv[0]); Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 29286) +++ trunk/tests/conf/conftest.c (revision 29287) @@ -1,6 +1,7 @@ #include #include #include +#include "config.h" #include #include #include