onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 16:13:13 +02:00
Code Issues Releases Wiki Activity

2079941 Patch for configure.in --with-qmake

Browse Source
This commit is contained in:
Vadim Kurland
2008-08-28 05:42:27 +00:00
parent 2c34e37903
commit 33b41ed1bc
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 490 #define BUILD_NUM 491
configure.in
+7 -2
View File
@@ -34,6 +34,7 @@ echo "Creating VERSION.h file..."
echo "#define VERSION \"$VERSION\"" > VERSION.h echo "#define VERSION \"$VERSION\"" > VERSION.h
echo "#define RELEASE_NUM \"$RELEASE_NUM\"" >> VERSION.h echo "#define RELEASE_NUM \"$RELEASE_NUM\"" >> VERSION.h
dnl try to find QT dnl try to find QT
dnl dnl
AC_ARG_WITH(qtdir,[ --with-qtdir=DIR Specify directory path for QT ]) AC_ARG_WITH(qtdir,[ --with-qtdir=DIR Specify directory path for QT ])
@@ -48,8 +49,12 @@ fi
# TODO: do we need to add $QTDIR/bin to PATH to find qmake? # TODO: do we need to add $QTDIR/bin to PATH to find qmake?
EXTENDED_PATH="/usr/local/bin:$PATH" EXTENDED_PATH="/usr/local/bin:$PATH"
# TODO: add support for --with-qmake option AC_ARG_WITH(qmake, [ --with-qmake=qmake Specify the qmake to be used (debian qmake-qt4) ])
AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH]) if test -n "$with_qmake"; then
AC_PATH_PROG(QMAKE, $with_qmake, ,[$EXTENDED_PATH])
else
AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
fi
if test -z "$QMAKE"; then if test -z "$QMAKE"; then
AC_MSG_ERROR("Could not find qmake") AC_MSG_ERROR("Could not find qmake")
fi fi
doc/ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2008-08-27 Vadim Kurland <vadim@vk.crocodile.org> 2008-08-27 Vadim Kurland <vadim@vk.crocodile.org>
* configure.in: Applied patch per bug #2079941: "Patch for
configure.in --with-qmake". Patch adds option --with-qmake to
configure in libfwbuilder and fwbuilder.
* iosaclAdvancedDialog.cpp (toggleGenerateLogging): fixed bug * iosaclAdvancedDialog.cpp (toggleGenerateLogging): fixed bug
#2078107: "IOS ACL compiler issue". Logging commands for IOS ACL #2078107: "IOS ACL compiler issue". Logging commands for IOS ACL
were not generated properly (settings made in the GUI were were not generated properly (settings made in the GUI were
qmake.inc
+17 -17
View File
@@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
MANDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/ MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
HAVE_ANTLR_RUNTIME = 1 HAVE_ANTLR_RUNTIME = 1
HAVE_EXTERNAL_ANTLR = 0 HAVE_EXTERNAL_ANTLR = 0
unix { unix {
ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
FWBPARSER_LIB = ../parsers/libfwbparser.a FWBPARSER_LIB = ../parsers/libfwbparser.a
} }
@@ -30,38 +30,38 @@ unix {
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root PREFIX = /home/vadim/src/fwb3-branch-v3/install_root
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
ICONSDIR = ICONSDIR = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
LIBS_FWBUILDER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
dtd.path = @TEMPLATE_DIR@/ dtd.path = @TEMPLATE_DIR@/
migration.path = @TEMPLATE_DIR@/migration migration.path = @TEMPLATE_DIR@/migration
doc.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
datadir.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/ datadir.path = /home/vadim/src/fwb3-branch-v3/install_root/share/
# win32:target.path = $$PREFIX/ # win32:target.path = $$PREFIX/
# unix:target.path = $$PREFIX/share/fwbuilder/ # unix:target.path = $$PREFIX/share/fwbuilder/
# macx:target.path = $$PREFIX/ # macx:target.path = $$PREFIX/
res.path = ../Resources res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0
res_os.path = ../Resources/os/ res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/
res_platform.path = ../Resources/platform/ res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/
res_help.path = ../Resources/help/ res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/
res_desktop.path = /Users/vadim/src/fwb3-branch-v3/install_root/share//applications/ res_desktop.path = /home/vadim/src/fwb3-branch-v3/install_root/share//applications/
INSTALLS += res INSTALLS += res
INSTALLS += res_os INSTALLS += res_os
INSTALLS += res_platform INSTALLS += res_platform
# INSTALLS += icns # INSTALLS += icns
LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll LIBS += $$LIBS_FWBUILDER -lutil
PKGLOCALEDIR = $$res.path/locale PKGLOCALEDIR = $$res.path/locale