From 0da0e454b2bc05001b0f4c9d151a9e57c54ff243 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Wed, 25 May 2005 15:38:46 +0000 Subject: [PATCH] Add WXCONFIG and WXFLAGS env variables to configure script. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2082 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/configure.in | 23 ++++++++++---------- bacula/configure | 41 ++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 90d1e21b3f..adafb99c7c 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -66,7 +66,12 @@ AC_PATH_PROG(PYTHON, python, python) AC_PATH_PROG(GROWISOFS, growisofs, growisofs) AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo) AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config) -AC_PATH_PROG(WXCONFIG, wx-config, wx-config) +AC_ARG_VAR(WXCONFIG, [wx-config command. On some systems, you must set it to wx-config-2.6 to use wxWidgets 2.6.]) +if test "x$WXCONFIG" = x; then + WXCONFIG=wx-config +fi +AC_PATH_PROG(WXCONFIG, ${WXCONFIG}, ${WXCONFIG}) +AC_ARG_VAR(WXFLAGS, [Parameters to pass to wx-config (e.g. --unicode=no).]) AC_PATH_PROG(CDRECORD, cdrecord, cdrecord) AC_PATH_PROG(PIDOF, pidof, pidof) AC_PROG_AWK @@ -169,6 +174,7 @@ support_gnome=no support_wx_console=no support_tls=no gnome_version= +wx_version= support_static_tools=no support_static_fd=no support_static_sd=no @@ -229,17 +235,12 @@ AC_ARG_ENABLE(wx-console, WX_DIR= if test x$support_wx_console = xyes; then - abc=`$WXCONFIG --cppflags` + abc=`$WXCONFIG $WXFLAGS --cppflags` pkg=$? if test $pkg = 0; then - WXRELEASE=`$WXCONFIG --release` - if test $WXRELEASE = 2.6; then - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` - WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` - else - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` - WXCONS_LDFLAGS=`$WXCONFIG --libs` - fi + wx_version="wxWidgets `$WXCONFIG $WXFLAGS --release`" + WXCONS_CPPFLAGS=`$WXCONFIG $WXFLAGS --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG $WXFLAGS --libs` AC_SUBST(WXCONS_CPPFLAGS) AC_SUBST(WXCONS_LDFLAGS) @@ -2088,7 +2089,7 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-gnome: ${support_gnome} ${gnome_version} - enable-wx-console: ${support_wx_console} + enable-wx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} ACL support: ${have_acl} diff --git a/bacula/configure b/bacula/configure index 36c42cafbd..0c372914c0 100755 --- a/bacula/configure +++ b/bacula/configure @@ -309,7 +309,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 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 ECHO CMP TBL AR OPENSSL MTX MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG CDRECORD PIDOF AWK 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 TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_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 PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM 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 MACOSX 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 ECHO CMP TBL AR OPENSSL MTX MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK 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 TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_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 PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM 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 MACOSX DISTNAME DISTVER LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -778,6 +778,14 @@ ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP +ac_env_WXCONFIG_set=${WXCONFIG+set} +ac_env_WXCONFIG_value=$WXCONFIG +ac_cv_env_WXCONFIG_set=${WXCONFIG+set} +ac_cv_env_WXCONFIG_value=$WXCONFIG +ac_env_WXFLAGS_set=${WXFLAGS+set} +ac_env_WXFLAGS_value=$WXFLAGS +ac_cv_env_WXFLAGS_set=${WXFLAGS+set} +ac_cv_env_WXFLAGS_value=$WXFLAGS # # Report the --help message. @@ -943,6 +951,9 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags CPP C preprocessor + WXCONFIG wx-config command. On some systems, you must set it to + wx-config-2.6 to use wxWidgets 2.6. + WXFLAGS Parameters to pass to wx-config (e.g. --unicode=no). Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -3960,8 +3971,12 @@ 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 + +if test "x$WXCONFIG" = x; then + WXCONFIG=wx-config +fi +# Extract the first word of "${WXCONFIG}", so it can be a program name with args. +set dummy ${WXCONFIG}; 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 @@ -3986,7 +4001,7 @@ do done done - test -z "$ac_cv_path_WXCONFIG" && ac_cv_path_WXCONFIG="wx-config" + test -z "$ac_cv_path_WXCONFIG" && ac_cv_path_WXCONFIG="${WXCONFIG}" ;; esac fi @@ -4000,6 +4015,7 @@ else echo "${ECHO_T}no" >&6 fi + # Extract the first word of "cdrecord", so it can be a program name with args. set dummy cdrecord; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4773,6 +4789,7 @@ support_gnome=no support_wx_console=no support_tls=no gnome_version= +wx_version= support_static_tools=no support_static_fd=no support_static_sd=no @@ -5171,17 +5188,12 @@ fi; WX_DIR= if test x$support_wx_console = xyes; then - abc=`$WXCONFIG --cppflags` + abc=`$WXCONFIG $WXFLAGS --cppflags` pkg=$? if test $pkg = 0; then - WXRELEASE=`$WXCONFIG --release` - if test $WXRELEASE = 2.6; then - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` - WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` - else - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` - WXCONS_LDFLAGS=`$WXCONFIG --libs` - fi + wx_version="wxWidgets `$WXCONFIG $WXFLAGS --release`" + WXCONS_CPPFLAGS=`$WXCONFIG $WXFLAGS --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG $WXFLAGS --libs` @@ -22287,6 +22299,7 @@ s,@GROWISOFS@,$GROWISOFS,;t t s,@DVDRWMEDIAINFO@,$DVDRWMEDIAINFO,;t t s,@PKGCONFIG@,$PKGCONFIG,;t t s,@WXCONFIG@,$WXCONFIG,;t t +s,@WXFLAGS@,$WXFLAGS,;t t s,@CDRECORD@,$CDRECORD,;t t s,@PIDOF@,$PIDOF,;t t s,@AWK@,$AWK,;t t @@ -23168,7 +23181,7 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-gnome: ${support_gnome} ${gnome_version} - enable-wx-console: ${support_wx_console} + enable-wx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} ACL support: ${have_acl} -- 2.39.5