Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 285457
Collapse All | Expand All

(-)configure.in.old (-5 / +11 lines)
Lines 4152-4167 Link Here
4152
        dnl This is not ideal we really ough to use the unixodbc-config
4152
        dnl This is not ideal we really ough to use the unixodbc-config
4153
        dnl  or iodbc-config if they exist.
4153
        dnl  or iodbc-config if they exist.
4154
4154
4155
        save_CPPFLAGS="$CPPFLAGS"
4156
        CPPFLAGS="$CPPFLAGS -I/usr/include/iodbc"
4157
        AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [])
4158
        CPPFLAGS="$save_CPPFLAGS"
4159
        if test "x$found_sql_h" = "x1" ; then
4160
            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -I/usr/include/iodbc"
4161
            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc")
4162
        else
4155
        AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
4163
        AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
4156
        if test "x$found_sql_h" = "x1" ; then
4164
        if test "x$found_sql_h" = "x1" ; then
4157
            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
4165
            AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
4158
            [
4166
            [
4159
                AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
4167
                AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
4160
                [
4161
                    AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
4162
                ])
4163
            ])
4168
            ])
4164
        fi
4169
        fi
4170
        fi
4165
        if test "x$ODBC_LINK" = "x" ; then
4171
        if test "x$ODBC_LINK" = "x" ; then
4166
            if test "$wxUSE_ODBC" = "sys" ; then
4172
            if test "$wxUSE_ODBC" = "sys" ; then
4167
                AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])
4173
                AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])

Return to bug 285457