diff -Naur mod_benchmark-2.0.0/config.h.in mod_benchmark-2.0.0.oden/config.h.in --- mod_benchmark-2.0.0/config.h.in 2003-08-16 21:42:56.000000000 +0200 +++ mod_benchmark-2.0.0.oden/config.h.in 2004-08-31 01:30:58.295772846 +0200 @@ -1,6 +1,5 @@ /* config.h.in. Generated from configure.in by autoheader. */ #undef WITH_MYSQL -#undef WITH_SYBASE #undef WITH_PGSQL #undef WITH_ORACLE #undef WITH_APACHE1 @@ -31,15 +30,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `comn' library (-lcomn). */ -#undef HAVE_LIBCOMN - -/* Define to 1 if you have the `cs' library (-lcs). */ -#undef HAVE_LIBCS - -/* Define to 1 if you have the `ct' library (-lct). */ -#undef HAVE_LIBCT - /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL diff -Naur mod_benchmark-2.0.0/configure.in mod_benchmark-2.0.0.oden/configure.in --- mod_benchmark-2.0.0/configure.in 2003-08-16 21:36:00.000000000 +0200 +++ mod_benchmark-2.0.0.oden/configure.in 2004-08-31 01:30:58.295772846 +0200 @@ -16,12 +16,6 @@ AM_PROG_LIBTOOL dnl Checks for libraries. -dnl Replace `main' with a function in -lcomn: -AC_CHECK_LIB(comn, main) -dnl Replace `main' with a function in -lcs: -AC_CHECK_LIB(cs, main) -dnl Replace `main' with a function in -lct: -AC_CHECK_LIB(ct, main) dnl Replace `main' with a function in -ldl: AC_CHECK_LIB(dl, main) dnl Replace `main' with a function in -lintl: @@ -127,34 +121,6 @@ [MYSQL_LIBDIR=/usr/lib/mysql]) AC_SUBST(MYSQL_LIBDIR) -dnl Sybase support required ? -AC_ARG_ENABLE(sybase, - [ --enable-sybase enable Sybase support (needs ct library) [default=no]], - [case "${enableval}" in - yes) with_sybase=true ;; - no) with_sybase=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-sybase) ;; - esac],[with_sybase=false]) -AM_CONDITIONAL(WITH_SYBASE, test x$with_sybase = xtrue) -if test "x$with_sybase" = "xtrue" ; -then - AC_DEFINE(WITH_SYBASE) -fi - -dnl Sybase Include Dir ? -AC_ARG_WITH(sybasedir, - [ --with-sybasedir=[dir] Directory of Sybase Include files [default=/opt/sybase-11.9.2/include]], - [SYBASE_INCDIR=${withval} ], - [SYBASE_INCDIR=/opt/sybase-11.9.2/include]) -AC_SUBST(SYBASE_INCDIR) - -dnl Sybase Lib Dir ? -AC_ARG_WITH(sybaselib, - [ --with-sybaselib=[dir] Directory of Sybase Library files [default=/opt/sybase-11.9.2/lib]], - [SYBASE_LIBDIR=${withval} ], - [SYBASE_LIBDIR=/opt/sybase-11.9.2/lib]) -AC_SUBST(SYBASE_LIBDIR) - dnl PostgreSQL support required ? AC_ARG_ENABLE(pgsql, [ --enable-pgsql enable PostgreSQL support [default=no]], diff -Naur mod_benchmark-2.0.0/src/Makefile.am mod_benchmark-2.0.0.oden/src/Makefile.am --- mod_benchmark-2.0.0/src/Makefile.am 2003-08-16 23:24:11.000000000 +0200 +++ mod_benchmark-2.0.0.oden/src/Makefile.am 2004-08-31 01:32:33.270311616 +0200 @@ -11,16 +11,6 @@ _MYSQL_LIBDIR = endif -if WITH_SYBASE -SYBASE_MOD = benchmark-sybase.la -_SYBASE_INCDIR = -I@SYBASE_INCDIR@ -_SYBASE_LIBDIR = -L@SYBASE_LIBDIR@ -else -SYBASE_MOD = -_SYBASE_INCDIR = -_SYBASE_LIBDIR = -endif - if WITH_PGSQL PGSQL_MOD = benchmark-pgsql.la _PGSQL_INCDIR = -I@PGSQL_INCDIR@ @@ -41,30 +31,24 @@ _ORACLE_LIBDIR = endif -INCLUDES = @APACHE_INCDIR@ $(_MYSQL_INCDIR) $(_SYBASE_INCDIR) $(_PGSQL_INCDIR) $(_ORACLE_INCDIR) +INCLUDES = @APACHE_INCDIR@ $(_MYSQL_INCDIR) $(_PGSQL_INCDIR) $(_ORACLE_INCDIR) CFLAGS = @CFLAGS@ @APACHE_CFLAGS@ libexec_PROGRAMS = sysstat2 benchmark_rt sysstat2_SOURCES = sysstat2.c sysstat2.h common.h benchmark_rt_SOURCES = benchmark_rt.c hash.c hash.h interf.h -lib_LTLIBRARIES = mod_benchmark.la $(MYSQL_MOD) $(SYBASE_MOD) $(PGSQL_MOD) $(ORACLE_MOD) +lib_LTLIBRARIES = mod_benchmark.la $(MYSQL_MOD) $(PGSQL_MOD) $(ORACLE_MOD) mod_benchmark_la_SOURCES = mod_benchmark.c sysstat2.h common.h interf.h -mod_benchmark_la_LDFLAGS = -module -shared -s -version-info 2:0:0 +mod_benchmark_la_LDFLAGS = -module -shared -avoid-version benchmark_mysql_la_SOURCES = benchmark-mysql.c common.h -benchmark_mysql_la_LDFLAGS = $(_MYSQL_LIBDIR) -lmysqlclient -module -shared -s -version-info 2:0:0 +benchmark_mysql_la_LDFLAGS = $(_MYSQL_LIBDIR) -lmysqlclient -module -shared -avoid-version benchmark_pgsql_la_SOURCES = benchmark-pgsql.c common.h -benchmark_pgsql_la_LDFLAGS = $(_PGSQL_LIBDIR) plpgsql.so -module -shared -s -version-info 2:0:0 - -benchmark_sybase_la_SOURCES = benchmark-sybase.c common.h -# for real Sybase Client API: -#benchmark_sybase_la_LDFLAGS = $(_SYBASE_LIBDIR) -lcomn -lintl -lsybtcl -lcs -lct -lsybdb -module -shared -s -version-info 2:0:0 -# for FreeTDS use: -benchmark_sybase_la_LDFLAGS = $(_SYBASE_LIBDIR) -lct -lsybdb -ltds -module -shared -s -version-info 2:0:0 +benchmark_pgsql_la_LDFLAGS = $(_PGSQL_LIBDIR) plpgsql.so -module -shared -avoid-version benchmark_oracle_la_SOURCES = benchmark-oracle.c common.h -benchmark_oracle_la_LDFLAGS = $(_ORACLE_LIBDIR) -locci -module -shared -s -version-info 2:0:0 +benchmark_oracle_la_LDFLAGS = $(_ORACLE_LIBDIR) -locci -module -shared -avoid-version