projects / packages / xbase.git / blame
| Commit | Line | Data |
|---|---|---|
| ab9e5a4a JB |
1 | --- xbase-2.1.1/xbase/xbexcept.h.orig 2003-08-16 21:59:39.000000000 +0200 |
| 2 | +++ xbase-2.1.1/xbase/xbexcept.h 2004-04-09 23:15:25.793063600 +0200 | |
| 3 | @@ -74,11 +74,11 @@ | |
| 4 | #include <exception> | |
| 5 | #elif HAVE_G___EXCEPTION_H | |
| 6 | #include <g++/exception.h> | |
| 7 | -#elif | |
| 8 | +#else | |
| 9 | #error "Exceptions are unsupported on your system." | |
| 10 | #endif | |
| 11 | ||
| 12 | -#ifdef __BORLANDC__ | |
| 13 | +#if defined(__BORLANDC__) || defined(HAVE_EXCEPTION) | |
| 14 | #define XB_THROW throw () | |
| 15 | using std::exception; | |
| 16 | #else | |
| 17 | --- xbase-2.1.1/configure.in.orig 2004-04-09 23:05:32.000000000 +0200 | |
| 18 | +++ xbase-2.1.1/configure.in 2004-04-09 23:18:35.402238624 +0200 | |
| 19 | @@ -92,7 +92,7 @@ | |
| 20 | ||
| 21 | ||
| 22 | # setup topdir | |
| 23 | -topdir = `pwd` | |
| 24 | +topdir=`pwd` | |
| 25 | AC_SUBST(topdir) | |
| 26 | ||
| 27 | ||
| 28 | @@ -193,6 +193,9 @@ | |
| 29 | enable_exceptions="$withval", enable_exceptions="no") | |
| 30 | if test "$enable_exceptions" = "yes"; then | |
| 31 | AC_DEFINE(HAVE_EXCEPTIONS, 1, HAVE_EXCEPTIONS) | |
| 32 | + AC_LANG_PUSH(C++) | |
| 33 | + AC_CHECK_HEADERS(exception g++/exception) | |
| 34 | + AC_LANG_POP | |
| 35 | fi | |
| 36 | ||
| 37 | # compile in support for castellano dates | |
| 38 | --- xbase-2.1.1/libtest/Makefile.am.orig 2003-08-12 22:44:46.000000000 +0200 | |
| 39 | +++ xbase-2.1.1/libtest/Makefile.am 2004-04-09 23:27:39.568512776 +0200 | |
| 40 | @@ -1,6 +1,6 @@ | |
| 41 | ||
| 42 | -INCLUDES= -I../xbase | |
| 43 | -LDADD = -L../xbase -lxbase | |
| 44 | +INCLUDES= -I$(topdir) -I$(topdir)/xbase | |
| 45 | +LDADD = $(topdir)/xbase/libxbase.la | |
| 46 | ||
| 47 | INSTALL_PROGRAM = @INSTALL@ | |
| 48 |