From: Kern Sibbald Date: Thu, 15 Apr 2004 16:23:33 +0000 (+0000) Subject: Add --enable-wx-console X-Git-Tag: Release-1.34.1~47 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1ca79ac10baad4cba310aede731e39b8c63ff9b6;p=bacula%2Fbacula Add --enable-wx-console git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1206 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/Makefile.in b/bacula/Makefile.in index c1af4b5acb..5bb0a1dc75 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -19,7 +19,7 @@ fd_subdirs = src scripts doc src/lib src/findlib src/filed \ @READLINE_SRC@ src/console rescue rescue/linux -subdirs = src/cats src/dird src/stored @GNOME_DIR@ src/tools +subdirs = src/cats src/dird src/stored @GNOME_DIR@ @WX_DIR@ src/tools all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 64f5635c3c..d6a2be3c01 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -19,7 +19,7 @@ dnl search for true and false programs. AC_PATH_PROGS(TRUEPRG, true, :) AC_PATH_PROGS(FALSEPRG, false, :) -AC_CANONICAL_HOST +#AC_CANONICAL_HOST dnl bacula version VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -63,6 +63,7 @@ AC_PATH_PROG(RANLIB, ranlib, ranlib) AC_PATH_PROG(OPENSSL, openssl, none) AC_PATH_PROG(MTX, mtx, mtx) AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config) +AC_PATH_PROG(WXCONFIG, wx-config, wx-config) test -n "$ARFLAG" || ARFLAGS="cr" AC_SUBST(ARFLAGS) @@ -145,6 +146,7 @@ support_smartalloc=yes support_readline=yes support_conio=yes support_gnome=no +support_wx_console=no gnome_version= support_static_tools=no support_static_fd=no @@ -174,10 +176,10 @@ if test x$support_gnome = xyes; then abc=`$PKGCONFIG --exists libgnomeui-2.0` pkg=$? if test $pkg = 0; then - GNOME_INCLUDEDIR=`pkg-config --cflags-only-I libgnomeui-2.0` - GNOMEUI_LIBS=`pkg-config --libs-only-l libgnomeui-2.0` - GNOME_LIBDIR=`pkg-config --libs libgnomeui-2.0` - GNOME_LIBS=`pkg-config --libs-only-l libgnomeui-2.0` + GNOME_INCLUDEDIR=`$PKGCONFIG --cflags-only-I libgnomeui-2.0` + GNOMEUI_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` + GNOME_LIBDIR=`$PKGCONFIG --libs libgnomeui-2.0` + GNOME_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` AC_SUBST(GNOME_INCLUDEDIR) AC_SUBST(GNOMEUI_LIBS) AC_SUBST(GNOME_LIBDIR) @@ -194,6 +196,36 @@ fi AC_SUBST(GNOME_DIR) +# ------------------------------------------- +# wx-console (default off) +# ------------------------------------------- +AC_ARG_ENABLE(wx-console, + [ --enable-wx-console enable build of wxWidgets console [disabled]], + [if test x$enableval = xyes; then + support_wx_console=yes + fi]) + +WX_DIR= +if test x$support_wx_console = xyes; then + abc=`$WXCONFIG --cppflags` + pkg=$? + if test $pkg = 0; then + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` + AC_SUBST(WXCONS_CPPFLAGS) + AC_SUBST(WXCONS_LDFLAGS) + WX_DIR=src/wx-console + else + echo " " + echo "wx-config program not found. wx-console disabled." + echo " " + support_wx_console=no + fi +fi +AC_SUBST(WX_DIR) + + + # ------------------------------------------- # smartalloc (default off) # ------------------------------------------- @@ -278,12 +310,15 @@ AC_ARG_ENABLE(static-cons, STATIC_CONS= STATIC_GNOME_CONS= +STATIC_WX_CONS= if test x$support_static_cons = xyes; then STATIC_CONS="static-bconsole" STATIC_GNOME_CONS="static-gnome-console" + STATIC_WX_CONS="static-wx-console" fi AC_SUBST(STATIC_CONS) AC_SUBST(STATIC_GNOME_CONS) +AC_SUBST(STATIC_WX_CONS) # ------------------------------------------- # client_only (default off) @@ -1566,8 +1601,8 @@ AC_OUTPUT([autoconf/Make.common \ scripts/bacula.desktop.gnome2 \ scripts/bacula.desktop.gnome1.consolehelper \ scripts/bacula.desktop.gnome2.consolehelper \ - scripts/bacula.desktop.gnome1.xsu \ - scripts/bacula.desktop.gnome2.xsu \ + scripts/bacula.desktop.gnome1.xsu \ + scripts/bacula.desktop.gnome2.xsu \ scripts/gnome-console.console_apps \ scripts/mtx-changer \ doc/Makefile \ @@ -1579,6 +1614,7 @@ AC_OUTPUT([autoconf/Make.common \ src/gnome-console/gnome-console.conf \ src/gnome2-console/Makefile \ src/gnome2-console/gnome-console.conf \ + src/wx-console/Makefile \ src/tconsole/Makefile \ src/dird/Makefile \ src/dird/bacula-dir.conf \ @@ -1736,6 +1772,7 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-gnome: ${support_gnome} ${gnome_version} + enable-wx-console: ${support_wx_console} client-only: ${build_client_only} " > config.out diff --git a/bacula/configure b/bacula/configure index 768ed8decb..ce713493d9 100755 --- a/bacula/configure +++ b/bacula/configure @@ -308,7 +308,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG build build_cpu build_vendor build_os host host_cpu host_vendor host_os VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password dir_user dir_group sd_user sd_group fd_user fd_group SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 DISTNAME DISTVER LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password dir_user dir_group sd_user sd_group fd_user fd_group SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 DISTNAME DISTVER LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -856,6 +856,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-gnome enable build of gnome-console GUI disabled + --enable-wx-console enable build of wxWidgets console disabled --enable-smartalloc enable smartalloc debugging support disabled --enable-static-tools enable static tape tools disabled --enable-static-fd enable static File daemon disabled @@ -1454,60 +1455,7 @@ done test -n "$FALSEPRG" || FALSEPRG=":" -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - +#AC_CANONICAL_HOST VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -3782,6 +3730,46 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "wx-config", so it can be a program name with args. +set dummy wx-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_WXCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $WXCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_WXCONFIG="$WXCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WXCONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_WXCONFIG" && ac_cv_path_WXCONFIG="wx-config" + ;; +esac +fi +WXCONFIG=$ac_cv_path_WXCONFIG + +if test -n "$WXCONFIG"; then + echo "$as_me:$LINENO: result: $WXCONFIG" >&5 +echo "${ECHO_T}$WXCONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + test -n "$ARFLAG" || ARFLAGS="cr" @@ -3796,8 +3784,61 @@ MAKE_SHELL=/bin/sh +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + echo "$as_me:$LINENO: checking for Operating System" >&5 echo $ECHO_N "checking for Operating System... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + case $host_os in *cygwin* ) CYGWIN=yes;; @@ -4322,6 +4363,7 @@ support_smartalloc=yes support_readline=yes support_conio=yes support_gnome=no +support_wx_console=no gnome_version= support_static_tools=no support_static_fd=no @@ -4350,10 +4392,10 @@ if test x$support_gnome = xyes; then abc=`$PKGCONFIG --exists libgnomeui-2.0` pkg=$? if test $pkg = 0; then - GNOME_INCLUDEDIR=`pkg-config --cflags-only-I libgnomeui-2.0` - GNOMEUI_LIBS=`pkg-config --libs-only-l libgnomeui-2.0` - GNOME_LIBDIR=`pkg-config --libs libgnomeui-2.0` - GNOME_LIBS=`pkg-config --libs-only-l libgnomeui-2.0` + GNOME_INCLUDEDIR=`$PKGCONFIG --cflags-only-I libgnomeui-2.0` + GNOMEUI_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` + GNOME_LIBDIR=`$PKGCONFIG --libs libgnomeui-2.0` + GNOME_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` @@ -4707,6 +4749,38 @@ fi +# ------------------------------------------- +# wx-console (default off) +# ------------------------------------------- +# Check whether --enable-wx-console or --disable-wx-console was given. +if test "${enable_wx_console+set}" = set; then + enableval="$enable_wx_console" + if test x$enableval = xyes; then + support_wx_console=yes + fi +fi; + +WX_DIR= +if test x$support_wx_console = xyes; then + abc=`$WXCONFIG --cppflags` + pkg=$? + if test $pkg = 0; then + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` + + + WX_DIR=src/wx-console + else + echo " " + echo "wx-config program not found. wx-console disabled." + echo " " + support_wx_console=no + fi +fi + + + + # ------------------------------------------- # smartalloc (default off) # ------------------------------------------- @@ -4806,13 +4880,16 @@ fi; STATIC_CONS= STATIC_GNOME_CONS= +STATIC_WX_CONS= if test x$support_static_cons = xyes; then STATIC_CONS="static-bconsole" STATIC_GNOME_CONS="static-gnome-console" + STATIC_WX_CONS="static-wx-console" fi + # ------------------------------------------- # client_only (default off) # ------------------------------------------- @@ -18109,7 +18186,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/bacula-fd.conf src/win32/Makefile $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/bacula-fd.conf src/win32/Makefile $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18673,6 +18750,7 @@ do "src/gnome-console/gnome-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/gnome-console/gnome-console.conf" ;; "src/gnome2-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;; "src/gnome2-console/gnome-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/gnome2-console/gnome-console.conf" ;; + "src/wx-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/wx-console/Makefile" ;; "src/tconsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tconsole/Makefile" ;; "src/dird/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;; "src/dird/bacula-dir.conf" ) CONFIG_FILES="$CONFIG_FILES src/dird/bacula-dir.conf" ;; @@ -18813,14 +18891,6 @@ s,@LIBS@,$LIBS,;t t s,@BUILD_DIR@,$BUILD_DIR,;t t s,@TRUEPRG@,$TRUEPRG,;t t s,@FALSEPRG@,$FALSEPRG,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t s,@VERSION@,$VERSION,;t t s,@DATE@,$DATE,;t t s,@LSMDATE@,$LSMDATE,;t t @@ -18853,12 +18923,21 @@ s,@AR@,$AR,;t t s,@OPENSSL@,$OPENSSL,;t t s,@MTX@,$MTX,;t t s,@PKGCONFIG@,$PKGCONFIG,;t t +s,@WXCONFIG@,$WXCONFIG,;t t s,@ARFLAGS@,$ARFLAGS,;t t s,@MAKE_SHELL@,$MAKE_SHELL,;t t s,@LOCAL_LIBS@,$LOCAL_LIBS,;t t s,@LOCAL_CFLAGS@,$LOCAL_CFLAGS,;t t s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t s,@LOCAL_DEFS@,$LOCAL_DEFS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t s,@HAVE_SUN_OS_TRUE@,$HAVE_SUN_OS_TRUE,;t t s,@HAVE_SUN_OS_FALSE@,$HAVE_SUN_OS_FALSE,;t t s,@HAVE_OSF1_OS_TRUE@,$HAVE_OSF1_OS_TRUE,;t t @@ -18908,12 +18987,16 @@ s,@GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t s,@GNOME_DOCKLETS_LIBS@,$GNOME_DOCKLETS_LIBS,;t t s,@GNOME_CAPPLET_LIBS@,$GNOME_CAPPLET_LIBS,;t t s,@GNOME_DIR@,$GNOME_DIR,;t t +s,@WXCONS_CPPFLAGS@,$WXCONS_CPPFLAGS,;t t +s,@WXCONS_LDFLAGS@,$WXCONS_LDFLAGS,;t t +s,@WX_DIR@,$WX_DIR,;t t s,@TTOOL_LDFLAGS@,$TTOOL_LDFLAGS,;t t s,@STATIC_FD@,$STATIC_FD,;t t s,@STATIC_SD@,$STATIC_SD,;t t s,@STATIC_DIR@,$STATIC_DIR,;t t s,@STATIC_CONS@,$STATIC_CONS,;t t s,@STATIC_GNOME_CONS@,$STATIC_GNOME_CONS,;t t +s,@STATIC_WX_CONS@,$STATIC_WX_CONS,;t t s,@ALL_DIRS@,$ALL_DIRS,;t t s,@CONS_INC@,$CONS_INC,;t t s,@CONS_OBJ@,$CONS_OBJ,;t t @@ -19594,6 +19677,7 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-gnome: ${support_gnome} ${gnome_version} + enable-wx-console: ${support_wx_console} client-only: ${build_client_only} " > config.out diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in index 41207617a4..ea491d0acb 100644 --- a/bacula/src/wx-console/Makefile.in +++ b/bacula/src/wx-console/Makefile.in @@ -20,10 +20,10 @@ first_rule: all dummy: # -CONSSRCS = main.c console_thread.c authenticate.c console_conf.c wxbrestorepanel.c \ - wxbmainframe.c wxbtableparser.c +CONSSRCS = main.cpp console_thread.cpp authenticate.c console_conf.c wxbrestorepanel.cpp \ + wxbmainframe.cpp wxbtableparser.cpp CONSOBJS = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o \ - wxbmainframe.o wxbtableparser.o + wxbmainframe.o wxbtableparser.o @if test "@DISTNAME@" = "cygwin" then \ CONSSRCS = $(CONSSRCS) wx-console_private.rc; \ @@ -33,14 +33,14 @@ fi # these are the objects that are changed by the .configure process EXTRAOBJS = @OBJLIST@ -CONS_INC=@CONS_INC@ -CONS_LIBS=@CONS_LIBS@ +CONS_INC= +CONS_LIBS= -# TODO: wx-config should be generated by configure -CONS_CPPFLAGS=@CONS_CPPFLAGS@ `wx-config --cppflags` -CONS_LDFLAGS=@CONS_LDFLAGS@ `wx-config --libs` +# wx-config generated by configure +CONS_CPPFLAGS=@WXCONS_CPPFLAGS@ +CONS_LDFLAGS=@WXCONS_LDFLAGS@ -.SUFFIXES: .c .o +.SUFFIXES: .cpp .c .o .PHONY: .DONTCARE: @@ -49,18 +49,50 @@ CONS_LDFLAGS=@CONS_LDFLAGS@ `wx-config --libs` $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) -I$(srcdir) \ -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $< +.cpp.o: + $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) -I$(srcdir) \ + -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $< + + #------------------------------------------------------------------------- all: Makefile wx-console @echo "==== Make of wx-console is good ====" @echo " " + +wx-console: $(CONSOBJS) ../lib/libbac.a + $(CXX) $(CONSOBJS) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) -lbac + +wx-console_private.res: wx-console_private.rc + windres.exe -i wx-console_private.rc -I rc -o wx-console_private.res -O coff + clean: @$(RMF) $(OBJ) wx-console distclean: clean + $(RMF) Makefile + $(RMF) -r CVS -wx-console: $(CONSOBJ) ../lib/libbac.a - $(CXX) $(LINKOBJ) -o wx-console $(LIBS) $(WLDFLAGS) $(CONS_LDFLAGS) -lbac - -wx-console_private.res: wx-console_private.rc - windres.exe -i wx-console_private.rc -I rc -o wx-console_private.res -O coff \ No newline at end of file +Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ + && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +# Semi-automatic generation of dependencies: +# Use gcc -MM because X11 `makedepend' doesn't work on all systems +# and it also includes system headers. +# `semi'-automatic since dependencies are generated at distribution time. + +depend: + @$(MV) Makefile Makefile.bak + @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile + @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile + @$(CC) -S -M $(CPPFLAGS) $(CONS_CPPFLAGS) -I$(srcdir) -I$(basedir) $(CONSSRCS) >> Makefile + @if test -f Makefile ; then \ + $(RMF) Makefile.bak; \ + else \ + $(MV) Makefile.bak Makefile; \ + echo -e "Something went wrong\n\a"; \ + fi + +# ----------------------------------------------------------------------- +# DO NOT DELETE: nice dependency list follows