Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Use autoconf to detect presence of gmtime_r() and localtime_r() (CVS 4846) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
9894d2ce418180b874406a7407e019dc |
| User & Date: | mlcreech 2008-03-09 01:38:09 |
Context
|
2008-03-09
| ||
| 02:00 | Change <sqlite3.h> to "sqlite3.h" in #includes (CVS 4847) check-in: 98e55fa4 user: mlcreech tags: trunk | |
| 01:38 | Use autoconf to detect presence of gmtime_r() and localtime_r() (CVS 4846) check-in: 9894d2ce user: mlcreech tags: trunk | |
| 01:14 | Replace SQLITE_EXTERN with SQLITE_API in exported variables when generating the amalgamation. Should fix #2982 (CVS 4845) check-in: f134c282 user: mlcreech tags: trunk | |
Changes
Changes to configure.
1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 ..... 19528 19529 19530 19531 19532 19533 19534 19535 19536 19537 19538 19539 19540 19541 ..... 20649 20650 20651 20652 20653 20654 20655 20656 20657 20658 20659 20660 20661 20662 20663 20664 20665 20666 20667 20668 20669 20670 20671 20672 20673 20674 20675 20676 20677 20678 20679 20680 20681 20682 20683 20684 20685 20686 20687 20688 20689 20690 20691 20692 20693 20694 20695 20696 20697 20698 20699 20700 20701 20702 20703 20704 20705 20706 20707 20708 20709 20710 20711 20712 20713 20714 20715 20716 20717 20718 20719 20720 20721 20722 20723 20724 20725 20726 20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 20743 20744 20745 20746 20747 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 20765 20766 20767 20768 20769 20770 20771 20772 20773 20774 20775 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 20814 20815 20816 20817 20818 20819 20820 20821 20822 20823 20824 20825 20826 20827 20828 20829 20830 20831 20832 20833 20834 20835 20836 20837 20838 20839 20840 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in # $Revision: 1.50 $ ######### # Programs needed # # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; p=${PACKAGE-default} ................................................................................ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done ######### # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi ................................................................................ if test "${use_loadextension}" = "yes" ; then LOADEXTENSION_FLAGS="" else LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi ######### # Figure out whether or not we have a "usleep()" function. # { echo "$as_me:$LINENO: checking for usleep" >&5 echo $ECHO_N "checking for usleep... $ECHO_C" >&6; } if test "${ac_cv_func_usleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Define usleep to an innocuous variant, in case <limits.h> declares usleep. For example, HP-UX 11i <limits.h> declares gettimeofday. */ #define usleep innocuous_usleep /* System header to define __stub macros and hopefully few prototypes, which can conflict with char usleep (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif #undef usleep /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif char usleep (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined __stub_usleep || defined __stub___usleep choke me #endif int main () { return usleep (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then ac_cv_func_usleep=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_usleep=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_usleep" >&5 echo "${ECHO_T}$ac_cv_func_usleep" >&6; } if test $ac_cv_func_usleep = yes; then CFLAGS="$CFLAGS -DHAVE_USLEEP=1" fi #-------------------------------------------------------------------- # Redefine fdatasync as fsync on systems that lack fdatasync #-------------------------------------------------------------------- { echo "$as_me:$LINENO: checking for fdatasync" >&5 echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6; } if test "${ac_cv_func_fdatasync+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Define fdatasync to an innocuous variant, in case <limits.h> declares fdatasync. For example, HP-UX 11i <limits.h> declares gettimeofday. */ #define fdatasync innocuous_fdatasync /* System header to define __stub macros and hopefully few prototypes, which can conflict with char fdatasync (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif #undef fdatasync /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif char fdatasync (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined __stub_fdatasync || defined __stub___fdatasync choke me #endif int main () { return fdatasync (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then ac_cv_func_fdatasync=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_fdatasync=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5 echo "${ECHO_T}$ac_cv_func_fdatasync" >&6; } if test $ac_cv_func_fdatasync = yes; then CFLAGS="$CFLAGS -DHAVE_FDATASYNC=1" fi ######### # Output the config header ac_config_headers="$ac_config_headers src/config.h" ######### |
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 ..... 19528 19529 19530 19531 19532 19533 19534 19535 19536 19537 19538 19539 19540 19541 19542 19543 19544 19545 19546 19547 19548 19549 19550 19551 19552 19553 19554 19555 19556 19557 19558 19559 19560 19561 19562 19563 19564 19565 19566 19567 19568 19569 19570 19571 19572 19573 19574 19575 19576 19577 19578 19579 19580 19581 19582 19583 19584 19585 19586 19587 19588 19589 19590 19591 19592 19593 19594 19595 19596 19597 19598 19599 19600 19601 19602 19603 19604 19605 19606 19607 19608 19609 19610 19611 19612 19613 19614 19615 19616 19617 19618 19619 19620 19621 19622 19623 19624 19625 19626 19627 19628 19629 19630 19631 19632 19633 19634 19635 19636 19637 19638 19639 19640 19641 19642 19643 ..... 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in # $Revision: 1.51 $ ######### # Programs needed # # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; p=${PACKAGE-default} ................................................................................ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done ######### # Figure out whether or not we have these functions # for ac_func in usleep fdatasync localtime_r gmtime_r do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. For example, HP-UX 11i <limits.h> declares gettimeofday. */ #define $ac_func innocuous_$ac_func /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif #undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined __stub_$ac_func || defined __stub___$ac_func choke me #endif int main () { return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done ######### # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi ................................................................................ if test "${use_loadextension}" = "yes" ; then LOADEXTENSION_FLAGS="" else LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi ######### # Output the config header ac_config_headers="$ac_config_headers src/config.h" ######### |
Changes to configure.ac.
88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 ... 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 ... 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 |
# the corresponding code. # AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in # $Revision: 1.36 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_AWK ................................................................................ ######### # Check for needed/wanted data types AC_CHECK_TYPES([int8_t, int16_t, int32_t, int64_t, intptr_t, uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t]) ######### # Check for needed/wanted headers AC_CHECK_HEADERS(sys/types.h stdlib.h stdint.h inttypes.h) ######### # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi ................................................................................ if test "${use_loadextension}" = "yes" ; then LOADEXTENSION_FLAGS="" else LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi AC_SUBST(LOADEXTENSION_FLAGS) ######### # Figure out whether or not we have a "usleep()" function. # AC_CHECK_FUNC(usleep, [CFLAGS="$CFLAGS -DHAVE_USLEEP=1"]) #-------------------------------------------------------------------- # Redefine fdatasync as fsync on systems that lack fdatasync #-------------------------------------------------------------------- AC_CHECK_FUNC(fdatasync, [CFLAGS="$CFLAGS -DHAVE_FDATASYNC=1"]) ######### # Output the config header AC_CONFIG_HEADERS(src/config.h) ######### # Generate the output files. # AC_SUBST(BUILD_CFLAGS) AC_OUTPUT([ Makefile sqlite3.pc ]) |
| | > > > > > > < < < < < < < < < < |
88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 ... 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 ... 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 |
# the corresponding code. # AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in # $Revision: 1.37 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_AWK ................................................................................ ######### # Check for needed/wanted data types AC_CHECK_TYPES([int8_t, int16_t, int32_t, int64_t, intptr_t, uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t]) ######### # Check for needed/wanted headers AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h]) ######### # Figure out whether or not we have these functions # AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r]) ######### # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi ................................................................................ if test "${use_loadextension}" = "yes" ; then LOADEXTENSION_FLAGS="" else LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi AC_SUBST(LOADEXTENSION_FLAGS) ######### # Output the config header AC_CONFIG_HEADERS(src/config.h) ######### # Generate the output files. # AC_SUBST(BUILD_CFLAGS) AC_OUTPUT([ Makefile sqlite3.pc ]) |
Changes to src/config.h.in.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
..
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Configuration header template to be filled in by 'configure' script ** ** @(#) $Id: config.h.in,v 1.2 2008/03/06 16:28:58 mlcreech Exp $ */ #ifndef _CONFIG_H_ #define _CONFIG_H_ /* Define as 1 if you have the int8_t type */ #undef HAVE_INT8_T /* Define as 1 if you have the int16_t type */ #undef HAVE_INT16_T /* Define as 1 if you have the int32_t type */ ................................................................................ /* Define as 1 if you have the uint64_t type */ #undef HAVE_UINT64_T /* Define as 1 if you have the uintptr_t type */ #undef HAVE_UINTPTR_T /* Define as 1 if you have the sys/types.h header */ #undef HAVE_SYS_TYPES_H /* Define as 1 if you have the stdlib.h header */ #undef HAVE_STDLIB_H /* Define as 1 if you have the stdint.h header */ #undef HAVE_STDINT_H /* Define as 1 if you have the inttypes.h header */ #undef HAVE_INTTYPES_H #endif |
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
..
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Configuration header template to be filled in by 'configure' script ** ** @(#) $Id: config.h.in,v 1.3 2008/03/09 01:38:10 mlcreech Exp $ */ #ifndef _CONFIG_H_ #define _CONFIG_H_ /***************************** ** Data types *****************************/ /* Define as 1 if you have the int8_t type */ #undef HAVE_INT8_T /* Define as 1 if you have the int16_t type */ #undef HAVE_INT16_T /* Define as 1 if you have the int32_t type */ ................................................................................ /* Define as 1 if you have the uint64_t type */ #undef HAVE_UINT64_T /* Define as 1 if you have the uintptr_t type */ #undef HAVE_UINTPTR_T /***************************** ** Header Files *****************************/ /* Define as 1 if you have the sys/types.h header */ #undef HAVE_SYS_TYPES_H /* Define as 1 if you have the stdlib.h header */ #undef HAVE_STDLIB_H /* Define as 1 if you have the stdint.h header */ #undef HAVE_STDINT_H /* Define as 1 if you have the inttypes.h header */ #undef HAVE_INTTYPES_H /***************************** ** Functions *****************************/ /* Define as 1 if you have the usleep() function */ #undef HAVE_USLEEP /* Define as 1 if you have the fdatasync() function */ #undef HAVE_FDATASYNC /* Define as 1 if you have the gmtime_r() function */ #undef HAVE_GMTIME_R /* Define as 1 if you have the localtime_r() function */ #undef HAVE_LOCALTIME_R /* End of header */ #endif |