mirror of
https://github.com/ra3xdh/qucs_s
synced 2025-03-28 21:13:26 +00:00
2004-01-24 Stefan Jahn <stefan@lkcc.org>
* configure.ac: Additionally checking for X headers and
libraries. Checking for multi-threaded and non-threaded Qt
library.
This commit is contained in:
ela
parent
7a1efc018b
commit
50e8aca13a
@ -1,3 +1,9 @@
|
||||
2004-01-24 Stefan Jahn <stefan@lkcc.org>
|
||||
|
||||
* configure.ac: Additionally checking for X headers and
|
||||
libraries. Checking for multi-threaded and non-threaded Qt
|
||||
library.
|
||||
|
||||
2004-01-19 Stefan Jahn <stefan@lkcc.org>
|
||||
|
||||
* configure.ac: Added qucs/doc/Makefile for output.
|
||||
|
||||
101
configure.ac
101
configure.ac
@ -17,7 +17,7 @@ AC_PROG_CXX
|
||||
AC_PROG_CC
|
||||
AC_PROG_RANLIB
|
||||
|
||||
# Check for debugging.
|
||||
# Check for debugging option.
|
||||
AC_ARG_ENABLE([debug],
|
||||
AC_HELP_STRING([--enable-debug],
|
||||
[include debug output @<:@default=no@:>@]),
|
||||
@ -51,58 +51,97 @@ fi
|
||||
# AC_CONFIG_SUBDIRS(qucs-core)
|
||||
|
||||
# Check for language support.
|
||||
AC_CHECK_PROG(LRELEASE, lrelease, lrelease, :)
|
||||
AC_CHECK_PROG(LUPDATE, lupdate, lupdate, :)
|
||||
AC_PATH_PROG(LRELEASE, lrelease, :)
|
||||
AC_PATH_PROG(LUPDATE, lupdate, :)
|
||||
|
||||
# Check for MOC/UIC support.
|
||||
AC_CHECK_PROG(MOC, moc, moc, :)
|
||||
AC_CHECK_PROG(UIC, uic, uic, :)
|
||||
AC_PATH_PROG(MOC, moc, :)
|
||||
AC_PATH_PROG(UIC, uic, :)
|
||||
|
||||
# Check for X11
|
||||
AC_PATH_XTRA
|
||||
X11_INCLUDES="$X_CFLAGS"
|
||||
X11_LDFLAGS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
|
||||
AC_SUBST(X11_INCLUDES)
|
||||
AC_SUBST(X11_LDFLAGS)
|
||||
|
||||
# Check include path to Qt.
|
||||
QINCLUDES=""
|
||||
QT_INCLUDES=""
|
||||
QT_VER=2
|
||||
AC_MSG_CHECKING([for Qt headers])
|
||||
paths="$QTDIR/include /usr/local/qt/include /usr/include/qt /usr/include/qt3 /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2"
|
||||
paths="$QTDIR/include /usr/local/qt/include /usr/include/qt /usr/include/qt3 \
|
||||
/usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/X11/qt \
|
||||
/usr/X11R6/include/qt /usr/X11R6/include/qt2"
|
||||
for path in $paths; do
|
||||
if test -f "$path/qapplication.h"; then
|
||||
QINCLUDES=$path
|
||||
QT_INCLUDES=$path
|
||||
if test -f "$path/qmemarray.h"; then
|
||||
QT_VER=3
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test "x$QINCLUDES" != "x"; then
|
||||
AC_MSG_RESULT([found in $QINCLUDES])
|
||||
QINCLUDES="-I$QINCLUDES"
|
||||
if test "x$QT_INCLUDES" != "x"; then
|
||||
AC_MSG_RESULT([found in $QT_INCLUDES])
|
||||
QT_INCLUDES="-I$QT_INCLUDES"
|
||||
else
|
||||
AC_MSG_ERROR([not found])
|
||||
fi
|
||||
AC_SUBST(QINCLUDES)
|
||||
AC_SUBST(QT_INCLUDES)
|
||||
|
||||
# Check for multi-threaded option.
|
||||
AC_ARG_ENABLE([mt],
|
||||
AC_HELP_STRING([--disable-mt],
|
||||
[link to non-threaded Qt (deprecated)]),
|
||||
enable_mt="$enableval",
|
||||
[if test $QT_VER = 3; then
|
||||
enable_mt="yes"
|
||||
else
|
||||
enable_mt="no"
|
||||
fi])
|
||||
if test "$enable_mt" = yes; then
|
||||
QT_LIB="-lqt-mt"
|
||||
QT_INC="-DQT_THREAD_SUPPORT -D_REENTRANT"
|
||||
QT_MTS="multi-threaded"
|
||||
else
|
||||
QT_LIB="-lqt"
|
||||
QT_INC=""
|
||||
QT_MTS="non-threaded"
|
||||
fi
|
||||
unset enable_mt
|
||||
|
||||
# Check library path to Qt.
|
||||
QLDFLAGS=""
|
||||
QT_LDFLAGS=""
|
||||
AC_MSG_RESULT([checking for Qt... $QT_VER ($QT_MTS)])
|
||||
AC_MSG_CHECKING([for Qt library])
|
||||
paths="$QTDIR/lib /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/X11R6/lib/qt2"
|
||||
paths="$QTDIR/lib /usr/local/qt/lib /usr/lib/qt /usr/lib \
|
||||
/usr/X11R6/lib/X11/qt /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt \
|
||||
/usr/X11R6/lib/qt2"
|
||||
AC_LANG(C++)
|
||||
for path in $paths; do
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
LDFLAGS="$LDFLAGS -L$path -lqt-mt"
|
||||
CXXFLAGS="$CXXFLAGS $QINCLUDES"
|
||||
LDFLAGS="$LDFLAGS $X11_LDFLAGS -L$path $QT_LIB"
|
||||
CXXFLAGS="$CXXFLAGS $X11_INCLUDES $QT_INCLUDES"
|
||||
AC_LINK_IFELSE(
|
||||
[#include <qapplication.h>
|
||||
int main (int argc, char ** argv) {
|
||||
QApplication a (argc, argv); a.exec (); return 0; }],
|
||||
[QLDFLAGS="$path"; QINCLUDES="$QINCLUDES -D_REENTRANT"; break;])
|
||||
[QT_LDFLAGS="$path";
|
||||
QT_INCLUDES="$QT_INCLUDES $QT_INC";
|
||||
break;])
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
done
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
if test "x$QLDFLAGS" != "x"; then
|
||||
AC_MSG_RESULT([found in $QLDFLAGS])
|
||||
QLDFLAGS="-L$QLDFLAGS -lqt-mt"
|
||||
if test "x$QT_LDFLAGS" != "x"; then
|
||||
AC_MSG_RESULT([found in $QT_LDFLAGS])
|
||||
QT_LDFLAGS="-L$QT_LDFLAGS $QT_LIB"
|
||||
else
|
||||
AC_MSG_ERROR([not found])
|
||||
fi
|
||||
AC_SUBST(QLDFLAGS)
|
||||
AC_SUBST(QT_LDFLAGS)
|
||||
AC_LANG(C)
|
||||
|
||||
# Create path info.
|
||||
@ -123,6 +162,26 @@ AC_DEFINE_UNQUOTED([DOCDIR], ["$DOC_PATH"],
|
||||
[Where the documentation files go.])
|
||||
unset DOC_PATH
|
||||
|
||||
# Definitions at top of <config.h>.
|
||||
AH_TOP([
|
||||
/* __BEGIN_DECLS should be used at the beginning of your declarations,
|
||||
so that C++ compilers don't mangle their names. Use __END_DECLS at
|
||||
the end of C declarations. */
|
||||
#undef __BEGIN_DECLS
|
||||
#undef __END_DECLS
|
||||
#ifdef __cplusplus
|
||||
# define __BEGIN_DECLS extern "C" {
|
||||
# define __END_DECLS }
|
||||
#else
|
||||
# define __BEGIN_DECLS
|
||||
# define __END_DECLS
|
||||
#endif
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE 1
|
||||
#endif
|
||||
])
|
||||
|
||||
# Add here all your Makefiles. This are created by configure.
|
||||
AC_CONFIG_FILES([Makefile
|
||||
qucs/Makefile
|
||||
|
||||
@ -33,8 +33,8 @@ qucs_SOURCES = fileshowdialog.cpp messagebox.cpp settingsdialog.cpp node.cpp \
|
||||
element.cpp simmessage.cpp qucsdoc.cpp wire.cpp newprojdialog.cpp \
|
||||
qucsview.cpp qucs.cpp main.cpp helpdialog.cpp $(MOCFILES)
|
||||
|
||||
INCLUDES = $(QINCLUDES)
|
||||
qucs_LDFLAGS = $(QLDFLAGS)
|
||||
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES)
|
||||
qucs_LDFLAGS = $(X11_LDFLAGS) $(QT_LDFLAGS)
|
||||
qucs_LDADD = sim/libsim.a components/libcomponents.a diagrams/libdiagrams.a \
|
||||
paintings/libpaintings.a
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user