From 2ea263af0df167fb718f071a02c4f7ee443e64d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Wed, 1 Feb 2012 01:48:13 +0000 Subject: [PATCH] [CONFIGURATION] * BUG: Fix the TEMPLATE directory broken by Randall. git-svn-id: svn://localhost/gambas/trunk@4443 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- TEMPLATE/template/NEWS | 0 TEMPLATE/template/README | 0 TEMPLATE/template/component.am | 1 - TEMPLATE/template/config.h | 158 --------------------------------- TEMPLATE/template/config.h.in | 157 -------------------------------- TEMPLATE/template/configure.ac | 70 +++++++++++++-- TEMPLATE/template/gambas.h | 1 - TEMPLATE/template/gb_common.h | 1 - 8 files changed, 63 insertions(+), 325 deletions(-) create mode 100644 TEMPLATE/template/NEWS create mode 100644 TEMPLATE/template/README delete mode 120000 TEMPLATE/template/component.am delete mode 100644 TEMPLATE/template/config.h delete mode 100644 TEMPLATE/template/config.h.in delete mode 120000 TEMPLATE/template/gambas.h delete mode 120000 TEMPLATE/template/gb_common.h diff --git a/TEMPLATE/template/NEWS b/TEMPLATE/template/NEWS new file mode 100644 index 000000000..e69de29bb diff --git a/TEMPLATE/template/README b/TEMPLATE/template/README new file mode 100644 index 000000000..e69de29bb diff --git a/TEMPLATE/template/component.am b/TEMPLATE/template/component.am deleted file mode 120000 index 2f0eee34f..000000000 --- a/TEMPLATE/template/component.am +++ /dev/null @@ -1 +0,0 @@ -../component.am \ No newline at end of file diff --git a/TEMPLATE/template/config.h b/TEMPLATE/template/config.h deleted file mode 100644 index 53841f792..000000000 --- a/TEMPLATE/template/config.h +++ /dev/null @@ -1,158 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Architecture */ -#define ARCHITECTURE "x86" - -/* Target architecture is ARM */ -/* #undef ARCH_ARM */ - -/* Target architecture is PowerPC */ -/* #undef ARCH_PPC */ - -/* Target architecture is x86 */ -#define ARCH_X86 1 - -/* Target architecture is x86_64 */ -/* #undef ARCH_X86_64 */ - -/* Full Gambas version */ -#define GAMBAS_FULL_VERSION 0x03000090 - -/* Gambas full version string */ -#define GAMBAS_FULL_VERSION_STRING "3.0" - -/* Gambas minor version */ -#define GAMBAS_MINOR_VERSION 0 - -/* Gambas bytecode version */ -#define GAMBAS_PCODE_VERSION 0x03010000 - -/* Minimum Gambas bytecode version */ -#define GAMBAS_PCODE_VERSION_MIN 0x03000000 - -/* Gambas version */ -#define GAMBAS_VERSION 3 - -/* Gambas version string */ -#define GAMBAS_VERSION_STRING "3" - -/* Define to 1 if you have the `cfmakeraw' function. */ -#define HAVE_CFMAKERAW 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Whether gcc supports -fvisibility=hidden */ -#define HAVE_GCC_VISIBILITY 1 - -/* Define to 1 if you have the `getdomainname' function. */ -#define HAVE_GETDOMAINNAME 1 - -/* Define to 1 if you have the `getpt' function. */ -#define HAVE_GETPT 1 - -/* Have GNU Scientific Library component */ -#define HAVE_GSL_COMPONENT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ -#define HAVE_LONG_DOUBLE 1 - -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ -#define HAVE_LONG_DOUBLE_WIDER 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `unsetenv' function. */ -#define HAVE_UNSETENV 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Target system is of BSD family */ -/* #undef OS_BSD */ - -/* Target system is Cygwin/Windows */ -/* #undef OS_CYGWIN */ - -/* Target system is FreeBSD */ -/* #undef OS_FREEBSD */ - -/* Target system is Linux */ -#define OS_LINUX 1 - -/* Target system is MacOS X */ -/* #undef OS_MACOSX */ - -/* Target system is NetBSD */ -/* #undef OS_NETBSD */ - -/* Target system is OpenBSD */ -/* #undef OS_OPENBSD */ - -/* Target system is Solaris */ -/* #undef OS_SOLARIS */ - -/* Name of package */ -#define PACKAGE "gambas3-gb-gsl" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Shared library extension is '.so' */ -#define SHARED_LIBRARY_EXT "so" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Operating system */ -#define SYSTEM "Linux" - -/* Version number of package */ -#define VERSION "3.0.90" diff --git a/TEMPLATE/template/config.h.in b/TEMPLATE/template/config.h.in deleted file mode 100644 index 847776a89..000000000 --- a/TEMPLATE/template/config.h.in +++ /dev/null @@ -1,157 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Architecture */ -#undef ARCHITECTURE - -/* Target architecture is ARM */ -#undef ARCH_ARM - -/* Target architecture is PowerPC */ -#undef ARCH_PPC - -/* Target architecture is x86 */ -#undef ARCH_X86 - -/* Target architecture is x86_64 */ -#undef ARCH_X86_64 - -/* Full Gambas version */ -#undef GAMBAS_FULL_VERSION - -/* Gambas full version string */ -#undef GAMBAS_FULL_VERSION_STRING - -/* Gambas minor version */ -#undef GAMBAS_MINOR_VERSION - -/* Gambas bytecode version */ -#undef GAMBAS_PCODE_VERSION - -/* Minimum Gambas bytecode version */ -#undef GAMBAS_PCODE_VERSION_MIN - -/* Gambas version */ -#undef GAMBAS_VERSION - -/* Gambas version string */ -#undef GAMBAS_VERSION_STRING - -/* Define to 1 if you have the `cfmakeraw' function. */ -#undef HAVE_CFMAKERAW - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Whether gcc supports -fvisibility=hidden */ -#undef HAVE_GCC_VISIBILITY - -/* Define to 1 if you have the `getdomainname' function. */ -#undef HAVE_GETDOMAINNAME - -/* Define to 1 if you have the `getpt' function. */ -#undef HAVE_GETPT - -/* Have GNU Scientific Library component */ -#undef HAVE_GSL_COMPONENT - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ -#undef HAVE_LONG_DOUBLE - -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ -#undef HAVE_LONG_DOUBLE_WIDER - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `unsetenv' function. */ -#undef HAVE_UNSETENV - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Target system is of BSD family */ -#undef OS_BSD - -/* Target system is Cygwin/Windows */ -#undef OS_CYGWIN - -/* Target system is FreeBSD */ -#undef OS_FREEBSD - -/* Target system is Linux */ -#undef OS_LINUX - -/* Target system is MacOS X */ -#undef OS_MACOSX - -/* Target system is NetBSD */ -#undef OS_NETBSD - -/* Target system is OpenBSD */ -#undef OS_OPENBSD - -/* Target system is Solaris */ -#undef OS_SOLARIS - -/* 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 home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Shared library extension is '.so' */ -#undef SHARED_LIBRARY_EXT - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Operating system */ -#undef SYSTEM - -/* Version number of package */ -#undef VERSION diff --git a/TEMPLATE/template/configure.ac b/TEMPLATE/template/configure.ac index 0bb5ee836..852ce826f 100644 --- a/TEMPLATE/template/configure.ac +++ b/TEMPLATE/template/configure.ac @@ -1,14 +1,70 @@ -dnl ---- configure.ac for gb.gsl +dnl ---- configure.ac for __COMPONENT AC_INIT(configure.ac) AC_CONFIG_MACRO_DIR([m4]) -GB_INIT(gb.gsl) +GB_INIT(__COMPONENT) AC_PROG_LIBTOOL + +#if __USE_XWINDOW || __USE_QT +GB_CHECK_XWINDOW +#endif + +#if __USE_QT +GB_FIND_QT_MOC +#endif + +#if __USE_PKGCONFIG + GB_COMPONENT_PKG_CONFIG( - gsl, - GSL, - [GNU Scientific Library component], + __NAME, + __UNAME, + [__DESCRIPTION], [src], - gsl) -AC_OUTPUT( Makefile src/Makefile ) + __PKGCONFIG_NAME) + +#else + +#if __USE_C +#define __LIBRARY_C $C_LIB +#else +#define __LIBRARY_C +#endif +#if __USE_CPP +#define __LIBRARY_CPP $CXX_LIB +#else +#define __LIBRARY_CPP +#endif +#if __USE_THREAD +#define __LIBRARY_THREAD $THREAD_LIB +#define __INCLUDE_THREAD $THREAD_INC +#else +#define __LIBRARY_THREAD +#define __INCLUDE_THREAD +#endif + +GB_COMPONENT( + __NAME, + __UNAME, + [__DESCRIPTION], + [src], +#ifdef __SEARCH_INCLUDE + [GB_FIND(__SEARCH_INCLUDE, __SEARCH_INCLUDE_PATH, __SEARCH_INCLUDE_DIR)], +#else + [], +#endif +#ifdef __SEARCH_LIBRARY + [GB_FIND(__SEARCH_LIBRARY, __SEARCH_LIBRARY_PATH, __SEARCH_LIBRARY_DIR)], +#else + [], +#endif + [__LIBRARY_C __LIBRARY_CPP __LIBRARY_THREAD __LIBRARY], + [__INCLUDE_THREAD __INCLUDE]) + +#endif + +AC_OUTPUT( \ +Makefile \ +src/Makefile \ +) + GB_PRINT_MESSAGES diff --git a/TEMPLATE/template/gambas.h b/TEMPLATE/template/gambas.h deleted file mode 120000 index 03677ecd0..000000000 --- a/TEMPLATE/template/gambas.h +++ /dev/null @@ -1 +0,0 @@ -../main/share/gambas.h \ No newline at end of file diff --git a/TEMPLATE/template/gb_common.h b/TEMPLATE/template/gb_common.h deleted file mode 120000 index 707d79da6..000000000 --- a/TEMPLATE/template/gb_common.h +++ /dev/null @@ -1 +0,0 @@ -../main/share/gb_common.h \ No newline at end of file