[kaffe] CVS kaffe (robilad): removed unused m4 macro
Kaffe CVS
cvs-commits at kaffe.org
Sun Mar 9 11:49:46 PDT 2008
PatchSet 7785
Date: 2008/03/09 18:46:53
Author: robilad
Branch: HEAD
Tag: (none)
Log:
removed unused m4 macro
2008-03-09 Dalibor Topic <robilad at kaffe.org>
* m4/gwqt.m4: Removed.
Members:
ChangeLog:1.5285->1.5286
m4/gwqt.m4:1.5->1.6(DEAD)
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5285 kaffe/ChangeLog:1.5286
--- kaffe/ChangeLog:1.5285 Sun Mar 9 18:44:24 2008
+++ kaffe/ChangeLog Sun Mar 9 18:46:53 2008
@@ -1,5 +1,9 @@
2008-03-09 Dalibor Topic <robilad at kaffe.org>
+ * m4/gwqt.m4: Removed.
+
+2008-03-09 Dalibor Topic <robilad at kaffe.org>
+
* WHATSNEW, TODO: Updated.
2008-03-09 Dalibor Topic <robilad at kaffe.org>
===================================================================
Checking out kaffe/m4/gwqt.m4
RCS: /home/cvs/kaffe/kaffe/m4/Attic/gwqt.m4,v
VERS: 1.5
***************
--- kaffe/m4/gwqt.m4 Sun Mar 9 18:49:45 2008
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,266 +0,0 @@
-# Check for Qt compiler flags, linker flags, and binary packages
-AC_DEFUN([gw_CHECK_QT],
-[
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PATH_X])
-
-
-AC_MSG_CHECKING([QTLIBDIR])
-AC_ARG_WITH([qt-libraries],
- [ --with-qt-libraries=DIR Qt library installation directory (default = $QTDIR/lib)],
- [QTLIBDIR=$withval]
-)
-if test x"$QTLIBDIR" = x"" ; then
- QTLIBDIR=$QTDIR/lib
-fi
-AC_MSG_RESULT([$QTLIBDIR])
-
-
-AC_MSG_CHECKING([QTBINDIR])
-AC_ARG_WITH([qt-binaries],
- [ --with-qt-binaries=DIR Qt binary installation directory (default = $QTDIR/bin)],
- [QTBINDIR=$withval]
-)
-if test x"$QTBINDIR" = x"" ; then
- QTBINDIR=$QTDIR/bin
-fi
-AC_MSG_RESULT([$QTBINDIR])
-
-
-AC_MSG_CHECKING([QTINCDIR])
-AC_ARG_WITH([qt-headers],
- [ --with-qt-headers=DIR Qt include directory (default = $QTDIR/include)],
- [QTINCDIR=$withval]
-)
-if test x"$QTINCDIR" = x"" ; then
- QTINCDIR=$QTDIR/include
-fi
-AC_MSG_RESULT([$QTINCDIR])
-
-
-AC_MSG_CHECKING([QTDIR])
-AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory (default=$QTDIR)], QTDIR=$withval)
-# Check that QTDIR is defined or that --with-qtdir given
-if test x"$QTDIR" = x ; then
- QT_SEARCH="/usr/lib/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/local/qt3 /usr/lib/qt2 /usr/local/qt2 /usr/lib/qt /usr/local/qt /usr/share/qt /usr/share/qt3"
- for i in $QT_SEARCH; do
- if test -f $i/include/qglobal.h -a x$QTDIR = x; then QTDIR=$i; fi
- done
-fi
-if test x"$QTDIR" = x ; then
- AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
-fi
-AC_MSG_RESULT([$QTDIR])
-
-# Change backslashes in QTDIR to forward slashes to prevent escaping
-# problems later on in the build process, mainly for Cygwin build
-# environment using MSVC as the compiler
-# TODO: Use sed instead of perl
-QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
-
-# Figure out which version of Qt we are using
-AC_MSG_CHECKING([Qt version])
-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINCDIR/qglobal.h | perl -p -e 's/\D//g'`
-case "${QT_VER}" in
- 2*)
- QT_MAJOR="2"
- ;;
- 3*)
- QT_MAJOR="3"
- ;;
- *)
- AC_MSG_ERROR([*** Don't know how to handle this Qt major version])
- ;;
-esac
-AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
-
-# Check that moc is in path
-AC_PATH_PROG(MOC, moc,,[$QTBINDIR:$PATH])
-if test x$MOC = x ; then
- AC_MSG_ERROR([*** moc must be in path])
-fi
-
-# uic is the Qt user interface compiler
-AC_PATH_PROG(UIC, uic,,[$QTBINDIR:$PATH])
-#if test x$UIC = x ; then
-# AC_MSG_ERROR([*** uic must be in path])
-#fi
-
-# qembed is the Qt data embedding utility.
-# It is located in $QTDIR/tools/qembed, and must be compiled and installed
-# manually, we'll let it slide if it isn't present
-AC_CHECK_PROG(QEMBED, qembed, qembed)
-
-
-# Calculate Qt include path
-QT_CXXFLAGS="-I$QTINCDIR"
-
-QT_IS_EMBEDDED="no"
-# On unix, figure out if we're doing a static or dynamic link
-case "${host}" in
- *-cygwin)
- AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
- if test -f "$QTLIBDIR/qt.lib" ; then
- QT_LIB="qt.lib"
- QT_IS_STATIC="yes"
- QT_IS_MT="no"
- elif test -f "$QTLIBDIR/qt-mt.lib" ; then
- QT_LIB="qt-mt.lib"
- QT_IS_STATIC="yes"
- QT_IS_MT="yes"
- elif test -f "$QTLIBDIR/qt$QT_VER.lib" ; then
- QT_LIB="qt$QT_VER.lib"
- QT_IS_STATIC="no"
- QT_IS_MT="no"
- elif test -f "$QTLIBDIR/qt-mt$QT_VER.lib" ; then
- QT_LIB="qt-mt$QT_VER.lib"
- QT_IS_STATIC="no"
- QT_IS_MT="yes"
- fi
- ;;
-
- *)
- QT_IS_STATIC=`ls $QTLIBDIR/libqt*.a 2>/dev/null`
- if test "x$QT_IS_STATIC" = x; then
- QT_IS_STATIC="no"
- else
- QT_IS_STATIC="yes"
- fi
- if test x$QT_IS_STATIC = xno ; then
- QT_IS_DYNAMIC=`ls $QTLIBDIR/*.so 2> /dev/null`
- if test "x$QT_IS_DYNAMIC" = x; then
- AC_MSG_ERROR([*** Couldn't find any Qt libraries])
- fi
- fi
-
- if test "x`ls $QTLIBDIR/libqt-mt.* 2> /dev/null`" != x ; then
- QT_LIB="-lqt-mt"
- QT_IS_MT="yes"
- elif test "x`ls $QTLIBDIR/libqt.* 2> /dev/null`" != x ; then
- QT_LIB="-lqt"
- QT_IS_MT="no"
- elif test "x`ls $QTLIBDIR/libqte-mt.* 2> /dev/null`" != x ; then
- QT_LIB="-lqte-mt"
- QT_IS_MT="yes"
- QT_IS_EMBEDDED="yes"
- elif test "x`ls $QTLIBDIR/libqte.* 2> /dev/null`" != x ; then
- QT_LIB="-lqte"
- QT_IS_MT="no"
- QT_IS_EMBEDDED="yes"
- fi
- ;;
-
-esac
-AC_MSG_CHECKING([if Qt is static])
-AC_MSG_RESULT([$QT_IS_STATIC])
-AC_MSG_CHECKING([if Qt is multithreaded])
-AC_MSG_RESULT([$QT_IS_MT])
-AC_MSG_CHECKING([if Qt is embedded])
-AC_MSG_RESULT([$QT_IS_EMBEDDED])
-
-if test x$QT_IS_EMBEDDED = xyes ; then
- QT_CXXFLAGS="$QT_CXXFLAGS -DQWS"
-
- # test for Qtopia
- AC_MSG_CHECKING([Qtopia])
- if test "x`ls $QTLIBDIR/libqpe.* 2> /dev/null`" != x ; then
- QT_CXXFLAGS="$QT_CXXFLAGS -DQPE"
- QT_LIB="-lqpe -lqtopia -lm $QT_LIB"
- AC_MSG_RESULT([found])
- else
- AC_MSG_RESULT([not found])
- fi
-fi
-
-QT_GUILINK=""
-QASSISTANTCLIENT_LDADD="-lqassistantclient"
-case "${host}" in
- *irix*)
- QT_LIBS="$QT_LIB"
- if test $QT_IS_STATIC = yes ; then
- QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE"
- fi
- ;;
-
- *linux*)
- QT_LIBS="$QT_LIB"
- if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
- QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg"
- fi
- ;;
-
-
- *osf*)
- # Digital Unix (aka DGUX aka Tru64)
- QT_LIBS="$QT_LIB"
- if test $QT_IS_STATIC = yes ; then
- QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE"
- fi
- ;;
-
- *solaris*)
- QT_LIBS="$QT_LIB"
- if test $QT_IS_STATIC = yes ; then
- QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl"
- fi
- ;;
-
-
- *win*)
- # linker flag to suppress console when linking a GUI app on Win32
- QT_GUILINK="/subsystem:windows"
-
- if test $QT_MAJOR = "3" ; then
- if test $QT_IS_MT = yes ; then
- QT_LIBS="/nodefaultlib:libcmt"
- else
- QT_LIBS="/nodefaultlib:libc"
- fi
- fi
-
- if test $QT_IS_STATIC = yes ; then
- QT_LIBS="$QT_LIBS $QT_LIB kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib shell32.lib imm32.lib advapi32.lib wsock32.lib winspool.lib winmm.lib netapi32.lib"
- if test $QT_MAJOR = "3" ; then
- QT_LIBS="$QT_LIBS qtmain.lib"
- fi
- else
- QT_LIBS="$QT_LIBS $QT_LIB"
- if test $QT_MAJOR = "3" ; then
- QT_CXXFLAGS="$QT_CXXFLAGS -DQT_DLL"
- QT_LIBS="$QT_LIBS qtmain.lib qui.lib user32.lib netapi32.lib"
- fi
- fi
- QASSISTANTCLIENT_LDADD="qassistantclient.lib"
- ;;
-
-esac
-
-
-if test x"$QT_IS_EMBEDDED" = "xyes" ; then
- QT_CXXFLAGS="-DQWS $QT_CXXFLAGS"
-fi
-
-if test x"$QT_IS_MT" = "xyes" ; then
- QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
-fi
-
-QT_LDADD="-L$QTLIBDIR $QT_LIBS"
-
-if test x$QT_IS_STATIC = xyes ; then
- OLDLIBS="$LIBS"
- LIBS="$QT_LDADD"
- AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft")
- LIBS="$LIBS"
-fi
-
-AC_MSG_CHECKING([QT_CXXFLAGS])
-AC_MSG_RESULT([$QT_CXXFLAGS])
-AC_MSG_CHECKING([QT_LDADD])
-AC_MSG_RESULT([$QT_LDADD])
-
-AC_SUBST(QT_CXXFLAGS)
-AC_SUBST(QT_LDADD)
-AC_SUBST(QT_GUILINK)
-AC_SUBST(QASSISTANTCLIENT_LDADD)
-
-])
More information about the kaffe
mailing list