-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Improved logging support (#15), misc fixes
- Improved logging support (uses spdlog) - VS build files now use vcpkg - Linux build fixes - MinGW (32/64) build with autoconf now is fully working, doesn't need qmake anymore
- Loading branch information
Showing
154 changed files
with
27,212 additions
and
1,121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| # Process this file with autoconf to produce a configure script. | ||
|
|
||
| AC_PREREQ([2.69]) | ||
| AC_INIT([gixsql], [1.0.16dev1], [[email protected]]) | ||
| AC_INIT([gixsql], [1.0.16dev2], [[email protected]]) | ||
| AC_CONFIG_SRCDIR([config.h.in]) | ||
| AC_CONFIG_HEADERS([config.h]) | ||
| AM_INIT_AUTOMAKE([1.9.6 -Wall -Werror dist-bzip2]) | ||
|
|
@@ -40,6 +40,34 @@ AC_TYPE_UINT64_T | |
| AC_TYPE_UINT8_T | ||
| AC_CHECK_TYPES([ptrdiff_t]) | ||
|
|
||
| # AC_CANONICAL_HOST is needed to access the 'host_os' variable | ||
| AC_CANONICAL_HOST | ||
|
|
||
| build_linux=no | ||
| build_windows=no | ||
| build_mac=no | ||
|
|
||
| # Detect the target system | ||
| case "${host_os}" in | ||
| linux*) | ||
| build_linux=yes | ||
| ;; | ||
| cygwin*|mingw*) | ||
| build_windows=yes | ||
| ;; | ||
| darwin*) | ||
| build_mac=yes | ||
| ;; | ||
| *) | ||
| AC_MSG_ERROR(["OS $host_os is not supported"]) | ||
| ;; | ||
| esac | ||
|
|
||
| # Pass the conditionals to automake | ||
| AM_CONDITIONAL([BUILD_LINUX], [test "$build_linux" = "yes"]) | ||
| AM_CONDITIONAL([BUILD_WINDOWS], [test "$build_windows" = "yes"]) | ||
| AM_CONDITIONAL([BUILD_OSX], [test "$build_mac" = "yes"]) | ||
|
|
||
| # Checks for libraries. | ||
| PKG_PROG_PKG_CONFIG | ||
|
|
||
|
|
@@ -62,6 +90,14 @@ AS_IF([test "$enable_mysql" != "no"], | |
| [PKG_CHECK_MODULES([MYSQL], | ||
| [mysqlclient], | ||
| [enable_mysql=yes], | ||
| [AS_IF([test "$enable_mysql" = "yes"], | ||
| [AC_MSG_ERROR([libmysqlclient required, but not found.])], | ||
| [enable_mysql=maybenot])])]) | ||
|
|
||
| AS_IF([test "$enable_mysql" != "no" && test "$enable_mysql" != "yes"], | ||
| [PKG_CHECK_MODULES([MARIADB], | ||
| [libmariadb], | ||
| [enable_mysql=yes], | ||
| [AS_IF([test "$enable_mysql" = "yes"], | ||
| [AC_MSG_ERROR([libmysqlclient required, but not found.])], | ||
| [enable_mysql=no])])]) | ||
|
|
@@ -92,13 +128,12 @@ AS_IF([test "$with_default_driver" == "none" || test "$with_default_driver" == " | |
|
|
||
| num_drivers=0 | ||
| cur_driver= | ||
| AS_IF([test "$enable_odbc" = "yes"], [ num_drivers=$(($numdrivers+1)) ; cur_driver=odbc ]) | ||
| AS_IF([test "$enable_mysql" = "yes"], [ num_drivers=$(($numdrivers+1)) ; cur_driver=mysql ]) | ||
| AS_IF([test "$enable_pgsql" = "yes"], [ num_drivers=$(($numdrivers+1)) ; cur_driver=pgsql ]) | ||
| AS_IF([test "$enable_odbc" = "yes"], [ ((num_drivers++)) ; cur_driver=odbc ]) | ||
| AS_IF([test "$enable_mysql" = "yes"], [ ((num_drivers++)) ; cur_driver=mysql ]) | ||
| AS_IF([test "$enable_pgsql" = "yes"], [ ((num_drivers++)) ; cur_driver=pgsql ]) | ||
|
|
||
| AS_IF([test "$num_drivers" = "0" ], [ AC_MSG_ERROR([At least one DBMS driver must be enabled]) ]) | ||
|
|
||
|
|
||
| AS_IF([test x$with_default_driver != xnone ], | ||
| [ | ||
| echo "setting ${with_default_driver} as default driver" | ||
|
|
@@ -141,6 +176,7 @@ AC_FUNC_MALLOC | |
| AC_CHECK_FUNCS([localeconv memmove memset select strcasecmp strdup strndup strrchr strstr strtoull]) | ||
|
|
||
| AC_CONFIG_FILES([Makefile | ||
| spdlog/Makefile | ||
| libcpputils/Makefile | ||
| libgixpp/Makefile | ||
| gixpp/Makefile | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| #pragma once | ||
|
|
||
| #define LIBGIXPP_VER "1.0.16dev1" | ||
| #define LIBGIXPP_VER "1.0.16dev2" |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.