From 415de7b257a9901274757be654f556ab7e00a2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 3 Sep 2022 13:24:51 +0200 Subject: [PATCH] Update configuration files to autoconf 2.71. [CONFIGURATION] * NEW: Update configuration files to autoconf 2.71. --- acinclude.m4 | 59 ++++++++++++--------------- app/configure.ac | 7 ++-- comp/configure.ac | 7 ++-- configure.ac | 5 ++- gb.cairo/configure.ac | 7 ++-- gb.compress.bzlib2/configure.ac | 9 ++-- gb.compress.zlib/configure.ac | 9 ++-- gb.compress.zstd/configure.ac | 9 ++-- gb.crypt/configure.ac | 9 ++-- gb.db.mysql/configure.ac | 31 ++++++-------- gb.db.odbc/configure.ac | 9 ++-- gb.db.postgresql/configure.ac | 9 ++-- gb.db.sqlite2/configure.ac | 9 ++-- gb.db.sqlite3/configure.ac | 9 ++-- gb.dbus/configure.ac | 7 ++-- gb.desktop.gnome.keyring/configure.ac | 7 ++-- gb.desktop.x11/configure.ac | 7 ++-- gb.form.htmlview/configure.ac | 7 ++-- gb.gmp/configure.ac | 7 ++-- gb.gsl/configure.ac | 7 ++-- gb.gtk/configure.ac | 9 ++-- gb.gtk3/configure.ac | 9 ++-- gb.httpd/configure.ac | 17 ++++---- gb.image.imlib/configure.ac | 7 ++-- gb.image.io/configure.ac | 7 ++-- gb.jit.llvm/configure.ac | 7 ++-- gb.libxml/configure.ac | 9 ++-- gb.media/configure.ac | 7 ++-- gb.mime/configure.ac | 7 ++-- gb.ncurses/configure.ac | 9 ++-- gb.net.curl/configure.ac | 9 ++-- gb.net/configure.ac | 7 ++-- gb.openal/configure.ac | 7 ++-- gb.opengl/configure.ac | 9 ++-- gb.openssl/configure.ac | 7 ++-- gb.pcre/configure.ac | 9 ++-- gb.pdf/configure.ac | 9 ++-- gb.poppler/configure.ac | 7 ++-- gb.qt4/configure.ac | 9 ++-- gb.qt5/configure.ac | 9 ++-- gb.sdl.sound/configure.ac | 9 ++-- gb.sdl/configure.ac | 9 ++-- gb.sdl2/configure.ac | 9 ++-- gb.v4l/configure.ac | 9 ++-- gb.xml/configure.ac | 9 ++-- m4/ax_compare_version.m4 | 5 +-- m4/gb_cflags_gcc_option.m4 | 20 ++++----- m4/gb_httpd.m4 | 38 ++++++----------- m4/gb_sdl.m4 | 12 +++--- main/configure.ac | 6 +-- 50 files changed, 269 insertions(+), 257 deletions(-) mode change 100755 => 100644 gb.xml/configure.ac diff --git a/acinclude.m4 b/acinclude.m4 index 055cfd86b..f3820b7f8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -72,7 +72,7 @@ AC_DEFUN([GB_INIT_AUTOMAKE], [ AM_INIT_AUTOMAKE([subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) - AC_CONFIG_HEADER([config.h]) + AC_CONFIG_HEADERS([config.h]) AC_PREFIX_DEFAULT(/usr) GAMBAS_VERSION=GB_VERSION_MAJOR @@ -190,9 +190,8 @@ AC_DEFUN([GB_INIT_SHORT], AC_DEFUN([GB_LIBTOOL], [ - AC_LIBTOOL_DLOPEN - ##AC_LIBLTDL_CONVENIENCE - AC_LIBTOOL_WIN32_DLL + dnl AC_LIBTOOL_DLOPEN + dnl AC_LIBTOOL_WIN32_DLL AC_DISABLE_STATIC AC_SUBST(INCLTDL) @@ -218,7 +217,6 @@ AC_DEFUN([GB_INIT], dnl ---- Checks for header files. dnl AC_HEADER_DIRENT - dnl AC_HEADER_STDC dnl AC_HEADER_SYS_WAIT dnl ---- Checks for typedefs, structures, and compiler characteristics. @@ -226,15 +224,21 @@ AC_DEFUN([GB_INIT], dnl AC_C_CONST dnl AC_TYPE_PID_T dnl AC_TYPE_SIZE_T - dnl AC_HEADER_TIME + dnl AC_CHECK_HEADERS_ONCE([sys/time.h]) + dnl AC_STRUCT_TM - dnl AC_C_LONG_DOUBLE + + AC_TYPE_LONG_DOUBLE_WIDER + ac_cv_c_long_double=$ac_cv_type_long_double_wider + if test $ac_cv_c_long_double = yes; then + AC_DEFINE([HAVE_LONG_DOUBLE],[1],[Define to 1 if the type `long double' works and has more range or + precision than `double'.]) + fi dnl ---- Checks for library functions. dnl AC_FUNC_ALLOCA dnl AC_PROG_GCC_TRADITIONAL - dnl AC_TYPE_SIGNAL dnl AC_FUNC_STRCOLL dnl AC_FUNC_STRFTIME dnl AC_FUNC_VPRINTF @@ -554,19 +558,16 @@ AC_DEFUN([GB_MATH], AC_DEFUN([GB_CHECK_MATH_FUNC], [AC_CACHE_CHECK(for $1, gb_cv_math_$1, - [AC_TRY_COMPILE( - [ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define _ISOC9X_SOURCE 1 #define _ISOC99_SOURCE 1 #define __USE_ISOC99 1 #define __USE_ISOC9X 1 #include - ], - [ + ]], [[ int value = $1 (1.0); - ], - gb_cv_math_$1=yes, gb_cv_math_$1=no - )]) + ]])],[gb_cv_math_$1=yes],[gb_cv_math_$1=no + ])]) if test $gb_cv_math_$1 = yes; then AC_DEFINE(HAVE_$2, 1, [Define if you have $1 function.]) @@ -1505,12 +1506,12 @@ rm -f conftest* dnl Check if the type socklen_t is defined anywhere AC_DEFUN([AC_C_SOCKLEN_T], [AC_CACHE_CHECK(for socklen_t, ac_cv_c_socklen_t, -[ AC_TRY_COMPILE([ +[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include -],[ +]], [[ socklen_t foo; -],[ +]])],[ ac_cv_c_socklen_t=yes ],[ ac_cv_c_socklen_t=no @@ -1522,11 +1523,9 @@ dnl Check nicked from aclocal.m4 from GNU bash 2.01 AC_DEFUN([AC_SYS_ERRLIST], [AC_MSG_CHECKING([for sys_errlist and sys_nerr]) AC_CACHE_VAL(ac_cv_sys_errlist, -[AC_TRY_LINK([#include ], -[extern char *sys_errlist[]; +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[extern char *sys_errlist[]; extern int sys_nerr; - char *msg = sys_errlist[sys_nerr - 1];], - ac_cv_sys_errlist=yes, ac_cv_sys_errlist=no)])dnl + char *msg = sys_errlist[sys_nerr - 1];]])],[ac_cv_sys_errlist=yes],[ac_cv_sys_errlist=no])])dnl AC_MSG_RESULT($ac_cv_sys_errlist) if test $ac_cv_sys_errlist = yes; then AC_DEFINE(HAVE_SYS_ERRLIST) @@ -1585,14 +1584,13 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], VAR,[VAR="no, unknown" AC_LANG_SAVE - AC_LANG_C + AC_LANG([C]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic % m4_ifval($2,$2,-option)" dnl GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -1626,8 +1624,7 @@ for ac_arg dnl in "-pedantic % m4_ifval($2,$2,-option)" dnl GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -1654,14 +1651,13 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], VAR,[VAR="no, unknown" AC_LANG_SAVE - AC_LANG_C + AC_LANG([C]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic % m4_ifval($1,$1,-option)" dnl GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -1695,8 +1691,7 @@ for ac_arg dnl in "-pedantic % m4_ifval($1,$1,-option)" dnl GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE diff --git a/app/configure.ac b/app/configure.ac index c11c0cec4..d817617ca 100644 --- a/app/configure.ac +++ b/app/configure.ac @@ -3,7 +3,7 @@ dnl ---- configure.ac for Gambas development environment dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-ide, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-ide],[GB_VERSION],[GB_MAIL],[],[GB_URL]) GB_INIT_SHORT(ide) dnl ---- Check for Portland scripts @@ -12,9 +12,10 @@ AC_CHECK_PROGS(XDG_UTILS, [xdg-mime xdg-icon-resource], []) dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ man/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/comp/configure.ac b/comp/configure.ac index ef97d678e..90eafb574 100644 --- a/comp/configure.ac +++ b/comp/configure.ac @@ -3,14 +3,15 @@ dnl ---- configure.ac for Gambas components written in Gambas dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-comp, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-comp],[GB_VERSION],[GB_MAIL],[],[GB_URL]) GB_INIT_SHORT(comp) dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/configure.ac b/configure.ac index e5967fc6a..33af5af3f 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl **************************************************************************** dnl ---- Initialization m4_include([version.m4]) -AC_INIT(gambas3, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_LN_S @@ -72,7 +72,8 @@ AC_SUBST(gblibdir) gbdatadir=$datadir/gambas$GAMBAS_VERSION/ AC_SUBST(gbdatadir) -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT GB_CLEAR_MESSAGES diff --git a/gb.cairo/configure.ac b/gb.cairo/configure.ac index a78124d18..5e4a93b98 100644 --- a/gb.cairo/configure.ac +++ b/gb.cairo/configure.ac @@ -1,17 +1,18 @@ dnl ---- configure.ac for gb.cairo m4_include([../version.m4]) -AC_INIT(gambas3-gb-cairo, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-cairo],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.cairo) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( cairo, CAIRO, gb.cairo, [src], 'cairo >= 1.6.0' 'cairo-ft >= 1.6.0' ) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.compress.bzlib2/configure.ac b/gb.compress.bzlib2/configure.ac index 859c2547a..0f226fccc 100644 --- a/gb.compress.bzlib2/configure.ac +++ b/gb.compress.bzlib2/configure.ac @@ -1,11 +1,11 @@ dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-gb-compress-bzlib2, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-compress-bzlib2],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.compress.bzlib2) -AC_PROG_LIBTOOL +LT_INIT dnl ---- bzlib2 compression driver @@ -17,9 +17,10 @@ GB_COMPONENT( dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.compress.zlib/configure.ac b/gb.compress.zlib/configure.ac index 90291eada..da1b5062a 100644 --- a/gb.compress.zlib/configure.ac +++ b/gb.compress.zlib/configure.ac @@ -1,11 +1,11 @@ dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-gb-compress-zlib, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-compress-zlib],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.compress.zlib) -AC_PROG_LIBTOOL +LT_INIT dnl ---- zlib compression driver @@ -15,9 +15,10 @@ GB_COMPONENT_PKG_CONFIG( dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.compress.zstd/configure.ac b/gb.compress.zstd/configure.ac index 071b79c42..d68042939 100644 --- a/gb.compress.zstd/configure.ac +++ b/gb.compress.zstd/configure.ac @@ -1,11 +1,11 @@ dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-gb-compress-zstd, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-compress-zstd],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.compress.zstd) -AC_PROG_LIBTOOL +LT_INIT dnl ---- zstd compression driver @@ -15,9 +15,10 @@ GB_COMPONENT_PKG_CONFIG( dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.crypt/configure.ac b/gb.crypt/configure.ac index 0858e2266..972a74756 100644 --- a/gb.crypt/configure.ac +++ b/gb.crypt/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.crypt m4_include([../version.m4]) -AC_INIT(gambas3-gb-crypt, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-crypt],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.crypt) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT( crypt, CRYPT, gb.crypt, [src], @@ -19,9 +19,10 @@ dnl ---- Remove DISABLED file that could have been generated before rm -f DISABLED DISABLED.* FAILED -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.db.mysql/configure.ac b/gb.db.mysql/configure.ac index 5a6313687..bf8b1258b 100644 --- a/gb.db.mysql/configure.ac +++ b/gb.db.mysql/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.db.mysql driver m4_include([../version.m4]) -AC_INIT(gambas3-gb-db-mysql, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-db-mysql],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.db.mysql) -AC_PROG_LIBTOOL +LT_INIT dnl LT_INIT GB_COMPONENT( @@ -19,15 +19,12 @@ CPPFLAGS=$MYSQL_INC AC_CACHE_CHECK(for SSL mode option, gb_cv_db_mysql_ssl_mode, - [AC_TRY_COMPILE( - [ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include - ], - [ + ]], [[ int flag = SSL_MODE_DISABLED; - ], - gb_cv_db_mysql_ssl_mode=yes, gb_cv_db_mysql_ssl_mode=no - )]) + ]])],[gb_cv_db_mysql_ssl_mode=yes],[gb_cv_db_mysql_ssl_mode=no + ])]) if test $gb_cv_db_mysql_ssl_mode = yes; then AC_DEFINE(HAVE_MYSQL_SSL_MODE_DISABLED, 1, [Define if you have SSL_MODE_DISABLED constant.]) @@ -35,15 +32,12 @@ fi AC_CACHE_CHECK(for retry count option, gb_cv_db_mysql_retry_count, - [AC_TRY_COMPILE( - [ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include - ], - [ + ]], [[ int opt = MYSQL_OPT_RETRY_COUNT; - ], - gb_cv_db_mysql_retry_count=yes, gb_cv_db_mysql_retry_count=no - )]) + ]])],[gb_cv_db_mysql_retry_count=yes],[gb_cv_db_mysql_retry_count=no + ])]) if test $gb_cv_db_mysql_retry_count = yes; then AC_DEFINE(HAVE_MYSQL_RETRY_COUNT, 1, [Define if you have SSL_OPT_RETRY_COUNT option.]) @@ -52,9 +46,10 @@ fi CPPFLAGS=$gb_save_cppflags -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.db.odbc/configure.ac b/gb.db.odbc/configure.ac index 106a9e952..230367d76 100644 --- a/gb.db.odbc/configure.ac +++ b/gb.db.odbc/configure.ac @@ -3,11 +3,11 @@ dnl ---- configure.ac for gb.db.odbc driver dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-gb-db-odbc, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-db-odbc],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.db.odbc) -AC_PROG_LIBTOOL +LT_INIT dnl ---- ODBC driver @@ -19,9 +19,10 @@ GB_COMPONENT( dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.db.postgresql/configure.ac b/gb.db.postgresql/configure.ac index f42a9355e..1e6e035a7 100644 --- a/gb.db.postgresql/configure.ac +++ b/gb.db.postgresql/configure.ac @@ -3,11 +3,11 @@ dnl ---- configure.ac for gb.db.postgresql driver dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-gb-db-postgresql, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-db-postgresql],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.db.postgresql) -AC_PROG_LIBTOOL +LT_INIT dnl ---- PostgreSQL driver @@ -19,9 +19,10 @@ GB_COMPONENT( dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.db.sqlite2/configure.ac b/gb.db.sqlite2/configure.ac index 02555b57a..608a375b7 100644 --- a/gb.db.sqlite2/configure.ac +++ b/gb.db.sqlite2/configure.ac @@ -3,11 +3,11 @@ dnl ---- configure.ac for gb.db.sqlite2 driver dnl ---- Initialization m4_include([../version.m4]) -AC_INIT(gambas3-gb-db-sqlite2, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-db-sqlite2],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.db.sqlite2) -AC_PROG_LIBTOOL +LT_INIT dnl ---- SQLite driver @@ -17,9 +17,10 @@ GB_COMPONENT_PKG_CONFIG( dnl ---- Create makefiles -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.db.sqlite3/configure.ac b/gb.db.sqlite3/configure.ac index a32573ab6..dbccdad31 100644 --- a/gb.db.sqlite3/configure.ac +++ b/gb.db.sqlite3/configure.ac @@ -1,19 +1,20 @@ dnl ---- configure.ac for gb.db.sqlite m4_include([../version.m4]) -AC_INIT(gambas3-gb-db-sqlite3, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-db-sqlite3],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.db.sqlite3) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( sqlite3, SQLITE3, gb.db.sqlite3, [src], 'sqlite3 >= 3.0') -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.dbus/configure.ac b/gb.dbus/configure.ac index bc9333b2e..72230916d 100644 --- a/gb.dbus/configure.ac +++ b/gb.dbus/configure.ac @@ -1,15 +1,16 @@ dnl ---- configure.ac for gb.dbus m4_include([../version.m4]) -AC_INIT(gambas3-gb-dbus, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-dbus],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.dbus) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( dbus, DBUS, gb.dbus, [src], dbus-1) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.desktop.gnome.keyring/configure.ac b/gb.desktop.gnome.keyring/configure.ac index ab0ed91fd..f7f01cfe9 100644 --- a/gb.desktop.gnome.keyring/configure.ac +++ b/gb.desktop.gnome.keyring/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.desktop.gnome.keyring m4_include([../version.m4]) -AC_INIT(gambas3-gb-desktop-gnome-keyring, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-desktop-gnome-keyring],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.desktop.gnome.keyring) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( gb_desktop_gnome_keyring, @@ -14,5 +14,6 @@ GB_COMPONENT_PKG_CONFIG( [src], gnome-keyring-1) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.desktop.x11/configure.ac b/gb.desktop.x11/configure.ac index b616663e9..d6068a295 100644 --- a/gb.desktop.x11/configure.ac +++ b/gb.desktop.x11/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.desktop.x11 m4_include([../version.m4]) -AC_INIT(gambas3-gb-desktop-x11, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-desktop-x11],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.desktop.x11) -AC_PROG_LIBTOOL +LT_INIT GB_CHECK_XWINDOW AC_CHECK_LIB(Xtst, XTestQueryExtension, [X_LIBS="$X_LIBS -lXtst"], [touch DISABLED], [$X_LIBS]) @@ -19,5 +19,6 @@ GB_COMPONENT( [$C_LIB $THREAD_LIB $X_LIBS], [$THREAD_INC]) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.form.htmlview/configure.ac b/gb.form.htmlview/configure.ac index 1b6b2e3e8..bcfe1f715 100644 --- a/gb.form.htmlview/configure.ac +++ b/gb.form.htmlview/configure.ac @@ -1,9 +1,9 @@ dnl ---- configure.ac for gb.form.htmlview m4_include([../version.m4]) -AC_INIT(gambas3-gb-form-htmlview, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-form-htmlview],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.form.htmlview) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT( htmlview, HTMLVIEW, @@ -13,5 +13,6 @@ GB_COMPONENT( [], [], []) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.gmp/configure.ac b/gb.gmp/configure.ac index 56d924e4a..96203084e 100644 --- a/gb.gmp/configure.ac +++ b/gb.gmp/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.gmp m4_include([../version.m4]) -AC_INIT(gambas3-gb-gmp, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-gmp],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.gmp) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT( gmp, @@ -16,5 +16,6 @@ GB_COMPONENT( [GB_FIND(libgmp.$SHLIBEXT, $prefix /usr/local /usr /opt/local, lib)], [$C_LIB -lgmp], [ ]) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.gsl/configure.ac b/gb.gsl/configure.ac index 3a6c7af97..799730448 100644 --- a/gb.gsl/configure.ac +++ b/gb.gsl/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.gsl m4_include([../version.m4]) -AC_INIT(gambas3-gb-gsl, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-gsl],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.gsl) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_SEARCH( gsl, GSL, gb.gsl, [src], @@ -14,5 +14,6 @@ GB_COMPONENT_SEARCH( [GB_FIND(libgslcblas.$SHLIBEXT libgsl.$SHLIBEXT, /usr/lib /usr/local /usr/local/lib `gsl-config --prefix`, lib)], [$X_LIBS -llibgsl -llibgslcblas]) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.gtk/configure.ac b/gb.gtk/configure.ac index b4d970366..5983ed30d 100644 --- a/gb.gtk/configure.ac +++ b/gb.gtk/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.gtk component m4_include([../version.m4]) -AC_INIT(gambas3-gb-gtk, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-gtk],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.gtk) -AC_PROG_LIBTOOL +LT_INIT GB_CHECK_XWINDOW() @@ -19,10 +19,11 @@ GB_COMPONENT_PKG_CONFIG( gtkglext-1.0 gl x11 ) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/opengl/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.gtk3/configure.ac b/gb.gtk3/configure.ac index 221fc2641..5a4c77054 100644 --- a/gb.gtk3/configure.ac +++ b/gb.gtk3/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.gtk3 component m4_include([../version.m4]) -AC_INIT(gambas3-gb-gtk3, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-gtk3],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.gtk3) -AC_PROG_LIBTOOL +LT_INIT GB_CHECK_XWINDOW() @@ -39,13 +39,14 @@ GB_COMPONENT_PKG_CONFIG( 'gtk+-3.0 >= 3.16' gl ) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/x11/Makefile \ src/wayland/Makefile \ src/webview/Makefile \ src/opengl/Makefile -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.httpd/configure.ac b/gb.httpd/configure.ac index 5fb0fa507..9e2145df7 100644 --- a/gb.httpd/configure.ac +++ b/gb.httpd/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.httpd m4_include([../version.m4]) -AC_INIT(gambas3-gb-httpd, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-httpd],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.httpd) -AC_PROG_LIBTOOL +LT_INIT V_CCOPT="-O" if test "$GCC" = yes ; then @@ -53,11 +53,8 @@ fi AC_MSG_CHECKING(for __progname) AC_CACHE_VAL(ac_cv_extern__progname, - AC_TRY_LINK([], - [extern char *__progname; - puts(__progname)], - ac_cv_extern__progname=yes, - ac_cv_extern__progname=no)) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *__progname; + puts(__progname)]])],[ac_cv_extern__progname=yes],[ac_cv_extern__progname=no])) if test $ac_cv_extern__progname = yes ; then AC_DEFINE([HAVE__PROGNAME], [], [have __progname]) AC_MSG_RESULT(yes) @@ -66,7 +63,8 @@ else fi AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/devpoll.h sys/event.h osreldate.h) -AC_HEADER_TIME +AC_CHECK_HEADERS_ONCE([sys/time.h]) + AC_HEADER_DIRENT dnl d="/usr/local/v6/lib" @@ -146,5 +144,6 @@ GB_COMPONENT( [], []) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.image.imlib/configure.ac b/gb.image.imlib/configure.ac index 8c1d0b731..493a616da 100644 --- a/gb.image.imlib/configure.ac +++ b/gb.image.imlib/configure.ac @@ -1,17 +1,18 @@ dnl ---- configure.ac for gb.image.imlib m4_include([../version.m4]) -AC_INIT(gambas3-gb-image-imlib, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-image-imlib],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.image.imlib) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( image_imlib, IMAGE_IMLIB, gb.image.imlib, [src], 'imlib2 >= 1.4.0' ) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.image.io/configure.ac b/gb.image.io/configure.ac index 662d2c82a..4b50d3162 100644 --- a/gb.image.io/configure.ac +++ b/gb.image.io/configure.ac @@ -1,17 +1,18 @@ dnl ---- configure.ac for gb.image.io m4_include([../version.m4]) -AC_INIT(gambas3-gb-image-io, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-image-io],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.image.io) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( image_io, IMAGE_IO, gb.image.io, [src], 'gdk-pixbuf-2.0 >= 2.4.13' ) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.jit.llvm/configure.ac b/gb.jit.llvm/configure.ac index 8f3e7b8ba..4a36b8e9a 100644 --- a/gb.jit.llvm/configure.ac +++ b/gb.jit.llvm/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.jit m4_include([../version.m4]) -AC_INIT(gambas3-gb-jit-llvm, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-jit-llvm],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.jit.llvm) -AC_PROG_LIBTOOL +LT_INIT min_llvm_version=3.1 max_llvm_version=3.5 @@ -48,6 +48,7 @@ GB_COMPONENT( [$C_LIB `$LLVM_CONFIG --ldflags` $LLVM_LIBS], [-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS]) -AC_OUTPUT(Makefile src/Makefile) +AC_CONFIG_FILES([Makefile src/Makefile]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.libxml/configure.ac b/gb.libxml/configure.ac index 7c62c5e46..ff422932f 100644 --- a/gb.libxml/configure.ac +++ b/gb.libxml/configure.ac @@ -1,19 +1,20 @@ dnl ---- configure.ac for gb.xml m4_include([../version.m4]) -AC_INIT(gambas3-gb-libxml, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-libxml],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.libxml) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( xml, XML, gb.libxml, [src], libxml-2.0) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.media/configure.ac b/gb.media/configure.ac index 36e3e111c..f55c50b67 100644 --- a/gb.media/configure.ac +++ b/gb.media/configure.ac @@ -1,16 +1,17 @@ dnl ---- configure.ac for gb.media m4_include([../version.m4]) -AC_INIT(gambas3-gb-media, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-media],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.media) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( media, MEDIA, gb.media, [src], gstreamer-1.0 gstreamer-video-1.0 ) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.mime/configure.ac b/gb.mime/configure.ac index 6c5cc839b..22f1886c8 100644 --- a/gb.mime/configure.ac +++ b/gb.mime/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.mime m4_include([../version.m4]) -AC_INIT(gambas3-gb-mime, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-mime],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.mime) -AC_PROG_LIBTOOL +LT_INIT gb_in_component_search=yes @@ -52,6 +52,7 @@ if test "$have_mime" = "no"; then fi -AC_OUTPUT(Makefile src/Makefile) +AC_CONFIG_FILES([Makefile src/Makefile]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.ncurses/configure.ac b/gb.ncurses/configure.ac index 6117c955e..006c9038d 100644 --- a/gb.ncurses/configure.ac +++ b/gb.ncurses/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.ncurses m4_include([../version.m4]) -AC_INIT(gambas3-gb-ncurses, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-ncurses],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.ncurses) -AC_PROG_LIBTOOL +LT_INIT PKG_PROG_PKG_CONFIG # Most distributions I have seen apparently provide the ncurses and panel @@ -24,9 +24,10 @@ GB_COMPONENT_PKG_CONFIG( ncurses, NCURSES, gb.ncurses, [src], $gb_ncurses_pkgconfig_names) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.net.curl/configure.ac b/gb.net.curl/configure.ac index 98e1bf39d..cf1e2b3a8 100644 --- a/gb.net.curl/configure.ac +++ b/gb.net.curl/configure.ac @@ -1,20 +1,21 @@ dnl ---- configure.ac for gb.net.curl m4_include([../version.m4]) -AC_INIT(gambas3-gb-net-curl, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-net-curl],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.net.curl) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( curl, CURL, gb.net.curl, [src], 'libcurl >= 7.13' ) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.net/configure.ac b/gb.net/configure.ac index 0085d800f..cc4f17670 100644 --- a/gb.net/configure.ac +++ b/gb.net/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.net m4_include([../version.m4]) -AC_INIT(gambas3-gb-net, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-net],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.net) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT( net, NET, gb.net, [src], @@ -14,6 +14,7 @@ GB_COMPONENT( [$C_LIB $THREAD_LIB], [$THREAD_INC]) -AC_OUTPUT(Makefile src/Makefile) +AC_CONFIG_FILES([Makefile src/Makefile]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.openal/configure.ac b/gb.openal/configure.ac index 5f3fe96f2..98670e596 100644 --- a/gb.openal/configure.ac +++ b/gb.openal/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.openal m4_include([../version.m4]) -AC_INIT(gambas3-gb-openal, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-openal],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.openal) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( openal, @@ -13,5 +13,6 @@ GB_COMPONENT_PKG_CONFIG( gb.openal, [src], ['openal >= 1.13' alure]) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.opengl/configure.ac b/gb.opengl/configure.ac index 87276674b..2a7887f6a 100644 --- a/gb.opengl/configure.ac +++ b/gb.opengl/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.opengl m4_include([../version.m4]) -AC_INIT(gambas3-gb-opengl, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-opengl],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.opengl) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( opengl, OPENGL, gb.opengl, [src], @@ -23,12 +23,13 @@ GB_COMPONENT_PKG_CONFIG( sge, SGE, gb.opengl.sge, [sge], [gl glew]) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/glu/Makefile \ src/glsl/Makefile \ src/sge/Makefile -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.openssl/configure.ac b/gb.openssl/configure.ac index da48fd178..469b23057 100644 --- a/gb.openssl/configure.ac +++ b/gb.openssl/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.openssl m4_include([../version.m4]) -AC_INIT(gambas3-gb-openssl, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-openssl],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.openssl) -AC_PROG_LIBTOOL +LT_INIT # We really only want to make sure that EVP_MD_do_all() exists. # Don't do a version check because some systems may have the @@ -16,5 +16,6 @@ AC_CHECK_LIB(crypto,EVP_MD_do_all,,touch DISABLED) GB_COMPONENT_PKG_CONFIG(openssl, OPENSSL, gb.openssl, [src], libcrypto) -AC_OUTPUT(Makefile src/Makefile) +AC_CONFIG_FILES([Makefile src/Makefile]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.pcre/configure.ac b/gb.pcre/configure.ac index 3f56cdb0b..b6936f450 100644 --- a/gb.pcre/configure.ac +++ b/gb.pcre/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.pcre m4_include([../version.m4]) -AC_INIT(gambas3-gb-pcre, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-pcre],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.pcre) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( pcre, PCRE, gb.pcre, [src], @@ -27,9 +27,10 @@ fi AM_CONDITIONAL(USE_PCRE2, test "$gb_use_pcre2" = 1) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac index 7104d81af..efe0d1c9f 100644 --- a/gb.pdf/configure.ac +++ b/gb.pdf/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.pdf m4_include([../version.m4]) -AC_INIT(gambas3-gb-pdf, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-pdf],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.pdf) -AC_PROG_LIBTOOL +LT_INIT PKG_PROG_PKG_CONFIG GB_COMPONENT_PKG_CONFIG( @@ -36,9 +36,10 @@ if test "$have_poppler" = "yes"; then AC_DEFINE_UNQUOTED(POPPLER_VERSION_22_06_0, $((1-$?)), Poppler version >= 22.06.0) fi -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.poppler/configure.ac b/gb.poppler/configure.ac index 35a544b7b..4365f5132 100644 --- a/gb.poppler/configure.ac +++ b/gb.poppler/configure.ac @@ -1,14 +1,15 @@ dnl ---- configure.ac for gb.poppler m4_include([../version.m4]) -AC_INIT(gambas3-gb-poppler, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-poppler],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.poppler) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( poppler, POPPLER, gb.poppler, [src], 'poppler >= 0.20' poppler-cpp poppler-glib) -AC_OUTPUT( Makefile src/Makefile ) +AC_CONFIG_FILES([Makefile src/Makefile ]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.qt4/configure.ac b/gb.qt4/configure.ac index ad1dabb2d..1c9ba6b99 100644 --- a/gb.qt4/configure.ac +++ b/gb.qt4/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.qt m4_include([../version.m4]) -AC_INIT(gambas3-gb-qt4, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-qt4],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.qt4) -AC_PROG_LIBTOOL +LT_INIT PKG_PROG_PKG_CONFIG AC_ARG_ENABLE( @@ -50,13 +50,14 @@ GB_COMPONENT_PKG_CONFIG( MOC=`$PKG_CONFIG --variable=moc_location QtCore` AC_SUBST(MOC) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/ext/Makefile \ src/webkit/Makefile \ src/webview/Makefile \ src/opengl/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.qt5/configure.ac b/gb.qt5/configure.ac index 16c621600..4f2701b4d 100644 --- a/gb.qt5/configure.ac +++ b/gb.qt5/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.qt5 m4_include([../version.m4]) -AC_INIT(gambas3-gb-qt5, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-qt5],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.qt5) -AC_PROG_LIBTOOL +LT_INIT PKG_PROG_PKG_CONFIG GB_CHECK_XWINDOW @@ -58,7 +58,7 @@ GB_COMPONENT_PKG_CONFIG( MOC=`$PKG_CONFIG --variable=host_bins Qt5Core`/moc AC_SUBST(MOC) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/x11/Makefile \ @@ -67,6 +67,7 @@ src/webkit/Makefile \ src/webview/Makefile \ src/opengl/Makefile \ src/ext/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.sdl.sound/configure.ac b/gb.sdl.sound/configure.ac index e3788f739..e1fdcea19 100644 --- a/gb.sdl.sound/configure.ac +++ b/gb.sdl.sound/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.sdl m4_include([../version.m4]) -AC_INIT(gambas3-gb-sdl-sound, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-sdl-sound],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.sdl.sound) -AC_PROG_LIBTOOL +LT_INIT dnl TODO: add a version test in GB_COMPONENT! GB_PATH_SDL(1.2.8, [] , [touch DISABLED]) @@ -15,9 +15,10 @@ GB_COMPONENT_PKG_CONFIG( sdlsound, SDLSOUND, gb.sdl.sound, [src], SDL_mixer) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.sdl/configure.ac b/gb.sdl/configure.ac index 0c2dac1bd..4c3208b76 100644 --- a/gb.sdl/configure.ac +++ b/gb.sdl/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.sdl m4_include([../version.m4]) -AC_INIT(gambas3-gb-sdl, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-sdl],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.sdl) -AC_PROG_LIBTOOL +LT_INIT GB_CHECK_XWINDOW @@ -40,9 +40,10 @@ GB_COMPONENT_SEARCH( [$SDL_CFLAGS] ) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.sdl2/configure.ac b/gb.sdl2/configure.ac index 2406d49f1..19bcfa02c 100644 --- a/gb.sdl2/configure.ac +++ b/gb.sdl2/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.sdl m4_include([../version.m4]) -AC_INIT(gambas3-gb-sdl2, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-sdl2],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.sdl2) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( sdl2, SDL2, gb.sdl2, [src], @@ -17,10 +17,11 @@ GB_COMPONENT_PKG_CONFIG( 'sdl2 >= 2.0.2' 'SDL2_mixer >= 2.0.0' ) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/audio/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.v4l/configure.ac b/gb.v4l/configure.ac index 9963cc0e8..5f295dd26 100644 --- a/gb.v4l/configure.ac +++ b/gb.v4l/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.v4l m4_include([../version.m4]) -AC_INIT(gambas3-gb-v4l, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-v4l],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.v4l) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT_PKG_CONFIG( v4lconvert, V4LCONVERT, gb.v4l, [src], @@ -17,9 +17,10 @@ GB_COMPONENT( [GB_FIND(libpng.$SHLIBEXT libjpeg.$SHLIBEXT, $prefix /usr/local /usr, lib)], [$C_LIB -ljpeg -lpng]) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES diff --git a/gb.xml/configure.ac b/gb.xml/configure.ac old mode 100755 new mode 100644 index 66cf8fb68..557cec031 --- a/gb.xml/configure.ac +++ b/gb.xml/configure.ac @@ -1,11 +1,11 @@ dnl ---- configure.ac for gb.xml m4_include([../version.m4]) -AC_INIT(gambas3-gb-xml, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-gb-xml],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) GB_INIT(gb.xml) -AC_PROG_LIBTOOL +LT_INIT GB_COMPONENT( xml, XML, gb.xml, [src], @@ -26,12 +26,13 @@ GB_COMPONENT_PKG_CONFIG( libxml-2.0 libxslt ) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ Makefile \ src/Makefile \ src/html/Makefile \ src/xslt/Makefile \ src/rpc/Makefile \ -) +]) +AC_OUTPUT GB_PRINT_MESSAGES \ No newline at end of file diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 index 74dc0fdd9..9f8c50550 100644 --- a/m4/ax_compare_version.m4 +++ b/m4/ax_compare_version.m4 @@ -145,8 +145,7 @@ x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` ], [.+],[ - AC_WARNING( - [illegal OP numeric parameter: $2]) + m4_warn([syntax], [illegal OP numeric parameter: $2]) ],[]) # Pad zeros at end of numbers to make same length. @@ -162,7 +161,7 @@ x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` [ne],[ test "x$A" != "x$B" && ax_compare_version=true ],[ - AC_WARNING([illegal OP parameter: $2]) + m4_warn([syntax], [illegal OP parameter: $2]) ]) ]) diff --git a/m4/gb_cflags_gcc_option.m4 b/m4/gb_cflags_gcc_option.m4 index 6d431c36d..966ed6b84 100644 --- a/m4/gb_cflags_gcc_option.m4 +++ b/m4/gb_cflags_gcc_option.m4 @@ -80,15 +80,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$2])dnl AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_C + AC_LANG([C]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -117,15 +116,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$2])dnl AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_CPLUSPLUS + AC_LANG([C++]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -153,15 +151,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$1])dnl AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_C + AC_LANG([C]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -190,15 +187,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$1])dnl AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_CPLUSPLUS + AC_LANG([C++]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE diff --git a/m4/gb_httpd.m4 b/m4/gb_httpd.m4 index fea63a5a6..180dfcdea 100644 --- a/m4/gb_httpd.m4 +++ b/m4/gb_httpd.m4 @@ -23,20 +23,17 @@ ac_lib_var=`echo $1['_']$2['_']$5 | sed 'y%./+- %__p__%'` AC_CACHE_VAL(ac_cv_lbl_lib_$ac_lib_var, [ac_save_LIBS="$LIBS" LIBS="-l$1 $5 $LIBS" -AC_TRY_LINK(dnl -ifelse([$2], [main], , dnl Avoid conflicting decl of main. -[/* Override any gcc2 internal prototype to avoid an error. */ -]ifelse(_AC_LANG_CURRENT, CPLUSPLUS, [#ifdef __cplusplus +AC_LINK_IFELSE([AC_LANG_PROGRAM([[dnl +ifelse($2, main, , dnl Avoid conflicting decl of main. +/* Override any gcc2 internal prototype to avoid an error. */ +ifelse(_AC_LANG_CURRENT, CPLUSPLUS, #ifdef __cplusplus extern "C" #endif -])dnl -[/* We use char because int might match the return type of a gcc2 +)dnl +/* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $2(); -]), - [$2()], - eval "ac_cv_lbl_lib_$ac_lib_var=yes", - eval "ac_cv_lbl_lib_$ac_lib_var=no") +)]], [[$2()]])],[eval "ac_cv_lbl_lib_$ac_lib_var=yes"],[eval "ac_cv_lbl_lib_$ac_lib_var=no"]) LIBS="$ac_save_LIBS" ])dnl if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then @@ -127,12 +124,9 @@ dnl AC_DEFUN([GB_AC_ACME_TM_GMTOFF], [AC_MSG_CHECKING(if struct tm has tm_gmtoff member) AC_CACHE_VAL(ac_cv_acme_tm_has_tm_gmtoff, - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ # include -# include ], - [u_int i = sizeof(((struct tm *)0)->tm_gmtoff)], - ac_cv_acme_tm_has_tm_gmtoff=yes, - ac_cv_acme_tm_has_tm_gmtoff=no)) +# include ]], [[u_int i = sizeof(((struct tm *)0)->tm_gmtoff)]])],[ac_cv_acme_tm_has_tm_gmtoff=yes],[ac_cv_acme_tm_has_tm_gmtoff=no])) AC_MSG_RESULT($ac_cv_acme_tm_has_tm_gmtoff) if test $ac_cv_acme_tm_has_tm_gmtoff = yes ; then AC_DEFINE([HAVE_TM_GMTOFF], [], [if struct tm has the BSD tm_gmtoff member]) @@ -152,11 +146,8 @@ dnl AC_DEFUN([GB_AC_ACME_INT64T], [AC_MSG_CHECKING(if int64_t exists) AC_CACHE_VAL(ac_cv_acme_int64_t, - AC_TRY_COMPILE([ -# include ], - [int64_t i64], - ac_cv_acme_int64_t=yes, - ac_cv_acme_int64_t=no)) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +# include ]], [[int64_t i64]])],[ac_cv_acme_int64_t=yes],[ac_cv_acme_int64_t=no])) AC_MSG_RESULT($ac_cv_acme_int64_t) if test $ac_cv_acme_int64_t = yes ; then AC_DEFINE([HAVE_INT64T], [], [if int64_t exists]) @@ -176,12 +167,9 @@ dnl AC_DEFUN([GB_AC_ACME_SOCKLENT], [AC_MSG_CHECKING(if socklen_t exists) AC_CACHE_VAL(ac_cv_acme_socklen_t, - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ # include -# include ], - [socklen_t slen], - ac_cv_acme_socklen_t=yes, - ac_cv_acme_socklen_t=no)) +# include ]], [[socklen_t slen]])],[ac_cv_acme_socklen_t=yes],[ac_cv_acme_socklen_t=no])) AC_MSG_RESULT($ac_cv_acme_socklen_t) if test $ac_cv_acme_socklen_t = yes ; then AC_DEFINE([HAVE_SOCKLENT], [], [if socklen_t exists]) diff --git a/m4/gb_sdl.m4 b/m4/gb_sdl.m4 index 2d8834e02..469cc0ed7 100644 --- a/m4/gb_sdl.m4 +++ b/m4/gb_sdl.m4 @@ -67,7 +67,7 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity dnl checks the results of sdl-config to some extent dnl rm -f conf.sdltest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include #include @@ -124,7 +124,7 @@ int main (int argc, char *argv[]) } } -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])],[],[no_sdl=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" @@ -148,7 +148,7 @@ int main (int argc, char *argv[]) CFLAGS="$CFLAGS $SDL_CFLAGS" CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include "SDL.h" @@ -156,8 +156,7 @@ int main(int argc, char *argv[]) { return 0; } #undef main #define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" +]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** version of SDL. If it is not finding SDL, you'll need to set your" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" @@ -165,8 +164,7 @@ int main(int argc, char *argv[]) echo "*** is required on your system" echo "***" echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) diff --git a/main/configure.ac b/main/configure.ac index c05df7144..70a57e132 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -1,13 +1,13 @@ dnl ---- configure.ac for main programs m4_include([../version.m4]) -AC_INIT(gambas3-main, GB_VERSION, GB_MAIL, [], GB_URL) +AC_INIT([gambas3-main],[GB_VERSION],[GB_MAIL],[],[GB_URL]) AC_CONFIG_MACRO_DIR([m4]) -GB_INIT(main) +GB_INIT([main]) GB_TRUNK_VERSION GB_MATH_FUNC -LT_INIT +LT_INIT([dlopen win32-dll]) AM_PROG_CC_C_O if test "x${GAMBAS_CONFIG_FAILURE}" != "x"; then