Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make changes to configure to fix mbug noted by David Elliot .

Browse Source 
(fix is based on david's patch ).
 Add odbc library status to the summary provided by configure.

 Fix typo it prologio test.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roger Gammans
2003-06-07 10:52:20 +00:00
parent 6613474976
commit fd3d753463
2 changed files with 284 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

545
configure vendored
View File

File diff suppressed because it is too large Load Diff

17
configure.in
View File

@@ -2776,16 +2776,18 @@ if test "$TOOLKIT" != "MSW" ; then
dnl or iodbc-config if they exist.
AC_CHECK_HEADER(sql.h)
AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [ wxUSE_ODBC=builtin ])
AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [
wxUSE_ODBC=builtin;
AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ])
] )
fi
dnl Not "no" either...
if test "$wxUSE_ODBC" != "sys" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
fi
fi
dnl Not "no" either...
if test "$wxUSE_ODBC" != "sys" ; then
AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ])
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
fi
fi
if test "$wxUSE_REGEX" = "builtin" ; then
@@ -4758,7 +4760,7 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
fi
if test "$wxUSE_PROLOGIO" = "yes" -o test "$wxUSE_RESOURCES" = "yes"; then
if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then
AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
fi
@@ -5724,6 +5726,7 @@ echo " png ${wxUSE_LIBPNG-n
echo " regex ${wxUSE_REGEX}"
echo " tiff ${wxUSE_LIBTIFF-none}"
echo " zlib ${wxUSE_ZLIB}"
echo " odbc ${wxUSE_ODBC}"
echo ""