mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-08 00:05:09 -04:00
added swedish translation
updated qgis.m4 and configure stuff git-svn-id: http://svn.osgeo.org/qgis/trunk@1225 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jobi
parent
70a80c3179
commit
37f7f437d4
554
acinclude.m4
554
acinclude.m4
@ -2,318 +2,316 @@ dnl ---------------------------------------------------------------------------
|
|||||||
dnl GDAL/OGR
|
dnl GDAL/OGR
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
# Check for GDAL and OGR compiler flags and linker flags
|
# Check for GDAL and OGR compiler and linker flags
|
||||||
|
|
||||||
AC_DEFUN([AQ_CHECK_GDAL],
|
AC_DEFUN([AQ_CHECK_GDAL],
|
||||||
[
|
[
|
||||||
AC_ARG_WITH([gdal],
|
AC_ARG_WITH([gdal],
|
||||||
AC_HELP_STRING([--with-gdal=path],
|
AC_HELP_STRING([--with-gdal=path],
|
||||||
[Full path to 'gdal-config' script, e.g. '--with-gdal=/usr/local/bin/gdal-config']),
|
[Full path to 'gdal-config' script, e.g. '--with-gdal=/usr/local/bin/gdal-config']),
|
||||||
[ac_gdal_config_path=$withval])
|
[ac_gdal_config_path=$withval])
|
||||||
|
|
||||||
if test x"$ac_gdal_config_path" = x ; then
|
if test x"$ac_gdal_config_path" = x ; then
|
||||||
ac_gdal_config_path=`which gdal-config`
|
ac_gdal_config_path=`which gdal-config`
|
||||||
|
fi
|
||||||
|
|
||||||
|
ac_gdal_config_path=`dirname $ac_gdal_config_path 2> /dev/null`
|
||||||
|
AC_PATH_PROG(GDAL_CONFIG, gdal-config, no, $ac_gdal_config_path)
|
||||||
|
|
||||||
|
if test x${GDAL_CONFIG} = xno ; then
|
||||||
|
AC_MSG_ERROR([gdal-config not found! Supply it with --with-gdal=PATH])
|
||||||
|
else
|
||||||
|
AC_MSG_CHECKING([for OGR in GDAL])
|
||||||
|
if test x`$GDAL_CONFIG --ogr-enabled` = "xno" ; then
|
||||||
|
AC_MSG_ERROR([GDAL must be compiled with OGR support and currently is not.])
|
||||||
fi
|
fi
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_MSG_CHECKING([GDAL_CFLAGS])
|
||||||
|
GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
|
||||||
|
AC_MSG_RESULT($GDAL_CFLAGS)
|
||||||
|
|
||||||
ac_gdal_config_path=`dirname $ac_gdal_config_path`
|
AC_MSG_CHECKING([GDAL_LDADD])
|
||||||
AC_PATH_PROG(GDAL_CONFIG, gdal-config, no, $ac_gdal_config_path)
|
GDAL_LDADD=`$GDAL_CONFIG --libs`
|
||||||
|
AC_MSG_RESULT($GDAL_LDADD)
|
||||||
|
|
||||||
if test x${GDAL_CONFIG} = xno ; then
|
ac_gdalogr="yes"
|
||||||
AC_MSG_ERROR([gdal-config not found! Supply it with --with-gdal=PATH])
|
fi
|
||||||
else
|
|
||||||
AC_MSG_CHECKING([for OGR in GDAL])
|
|
||||||
if test x`$GDAL_CONFIG --ogr-enabled` = "xno" ; then
|
|
||||||
AC_MSG_ERROR([GDAL must be compiled with OGR support and currently is not.])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([GDAL_CFLAGS])
|
AC_SUBST(GDAL_CFLAGS)
|
||||||
GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
|
AC_SUBST(GDAL_LDADD)
|
||||||
AC_MSG_RESULT($GDAL_CFLAGS)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([GDAL_LDADD])
|
|
||||||
GDAL_LDADD=`$GDAL_CONFIG --libs`
|
|
||||||
AC_MSG_RESULT($GDAL_LDADD)
|
|
||||||
|
|
||||||
ac_gdalogr="yes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(GDAL_CFLAGS)
|
|
||||||
AC_SUBST(GDAL_LDADD)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl QT3
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
# Check for Qt compiler flags, linker flags, and binary packages
|
# Check for Qt compiler flags, linker flags, and binary packages
|
||||||
|
|
||||||
AC_DEFUN([AQ_CHECK_QT],
|
AC_DEFUN([AQ_CHECK_QT],
|
||||||
[
|
[
|
||||||
AC_REQUIRE([AC_PROG_CXX])
|
AC_REQUIRE([AC_PROG_CXX])
|
||||||
AC_REQUIRE([AC_PATH_X])
|
AC_REQUIRE([AC_PATH_X])
|
||||||
|
|
||||||
AC_MSG_CHECKING([QTDIR])
|
AC_MSG_CHECKING([QTDIR])
|
||||||
AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=/usr/local]], QTDIR=$withval)
|
AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=/usr/local]], QTDIR=$withval)
|
||||||
# Check that QTDIR is defined or that --with-qtdir given
|
# Check that QTDIR is defined or that --with-qtdir given
|
||||||
if test x"$QTDIR" = x ; then
|
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"
|
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"
|
||||||
for i in $QT_SEARCH; do
|
for i in $QT_SEARCH; do
|
||||||
if test -a x$QTDIR = x; then
|
if test -a x$QTDIR = x; then
|
||||||
if test -f $i/include/qt/qglobal.h -o -f $i/include/qglobal.h; then
|
if test -f $i/include/qt/qglobal.h -o -f $i/include/qglobal.h; then
|
||||||
QTDIR=$i
|
QTDIR=$i
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
done
|
fi
|
||||||
fi
|
done
|
||||||
if test x"$QTDIR" = x ; then
|
fi
|
||||||
AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
|
if test x"$QTDIR" = x ; then
|
||||||
fi
|
AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
|
||||||
AC_MSG_RESULT([$QTDIR])
|
fi
|
||||||
|
AC_MSG_RESULT([$QTDIR])
|
||||||
|
|
||||||
# Change backslashes in QTDIR to forward slashes to prevent escaping
|
# Change backslashes in QTDIR to forward slashes to prevent escaping
|
||||||
# problems later on in the build process, mainly for Cygwin build
|
# problems later on in the build process, mainly for Cygwin build
|
||||||
# environment using MSVC as the compiler
|
# environment using MSVC as the compiler
|
||||||
# TODO: Use sed instead of perl
|
# TODO: Use sed instead of perl
|
||||||
QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
|
QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
|
||||||
|
|
||||||
# Check for QT includedir on Mac OSX
|
# Check for QT includedir on Mac OSX
|
||||||
if test -f $QTDIR/include/qt/qglobal.h; then
|
if test -f $QTDIR/include/qt/qglobal.h; then
|
||||||
QTINC=$QTDIR/include/qt
|
QTINC=$QTDIR/include/qt
|
||||||
else
|
else
|
||||||
QTINC=$QTDIR/include
|
QTINC=$QTDIR/include
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Figure out which version of Qt we are using
|
# Figure out which version of Qt we are using
|
||||||
AC_MSG_CHECKING([Qt version])
|
AC_MSG_CHECKING([Qt version])
|
||||||
QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINC/qglobal.h | perl -p -e 's/\D//g'`
|
QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINC/qglobal.h | perl -p -e 's/\D//g'`
|
||||||
case "${QT_VER}" in
|
case "${QT_VER}" in
|
||||||
33*)
|
33*)
|
||||||
QT_MAJOR="3"
|
QT_MAJOR="3"
|
||||||
;;
|
|
||||||
32*)
|
|
||||||
QT_MAJOR="3"
|
|
||||||
;;
|
|
||||||
31*)
|
|
||||||
QT_MAJOR="3"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_MSG_ERROR([*** Qt version 3.1.x or higher is required])
|
|
||||||
;;
|
;;
|
||||||
esac
|
32*)
|
||||||
AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
|
QT_MAJOR="3"
|
||||||
|
;;
|
||||||
|
31*)
|
||||||
|
QT_MAJOR="3"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_ERROR([*** Qt version 3.1.x or higher is required])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
|
||||||
|
|
||||||
# Check that moc is in path
|
# Check that moc is in path
|
||||||
AC_CHECK_PROG(MOC, moc, moc)
|
AC_CHECK_PROG(MOC, moc, moc)
|
||||||
if test x$MOC = x ; then
|
if test x$MOC = x ; then
|
||||||
AC_MSG_ERROR([*** moc must be in path])
|
AC_MSG_ERROR([*** moc must be in path])
|
||||||
fi
|
fi
|
||||||
|
# uic is the Qt user interface compiler
|
||||||
|
AC_CHECK_PROG(UIC, uic, uic)
|
||||||
|
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$QTINC"
|
||||||
|
QT_IS_EMBEDDED="no"
|
||||||
|
# On unix, figure out if we're doing a static or dynamic link
|
||||||
|
|
||||||
# uic is the Qt user interface compiler
|
case "${host}" in
|
||||||
AC_CHECK_PROG(UIC, uic, uic)
|
*-cygwin)
|
||||||
if test x$UIC = x ; then
|
AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
|
||||||
AC_MSG_ERROR([*** uic must be in path])
|
echo "$QTDIR/lib/qt-mt$QT_VER.lib"
|
||||||
fi
|
if test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then
|
||||||
|
QT_LIB="qt-mt$QT_VER.lib"
|
||||||
# qembed is the Qt data embedding utility.
|
QT_IS_STATIC="no"
|
||||||
# It is located in $QTDIR/tools/qembed, and must be compiled and installed
|
QT_IS_MT="yes"
|
||||||
# manually, we'll let it slide if it isn't present
|
|
||||||
AC_CHECK_PROG(QEMBED, qembed, qembed)
|
elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then
|
||||||
|
QT_LIB="qt$QT_VER.lib"
|
||||||
# Calculate Qt include path
|
QT_IS_STATIC="no"
|
||||||
QT_CXXFLAGS="-I$QTINC"
|
QT_IS_MT="no"
|
||||||
|
elif test -f "$QTDIR/lib/qt.lib" ; then
|
||||||
QT_IS_EMBEDDED="no"
|
QT_LIB="qt.lib"
|
||||||
# On unix, figure out if we're doing a static or dynamic link
|
QT_IS_STATIC="yes"
|
||||||
|
QT_IS_MT="no"
|
||||||
case "${host}" in
|
elif test -f "$QTDIR/lib/qt-mt.lib" ; then
|
||||||
*-cygwin)
|
QT_LIB="qt-mt.lib"
|
||||||
AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
|
QT_IS_STATIC="yes"
|
||||||
echo "$QTDIR/lib/qt-mt$QT_VER.lib"
|
QT_IS_MT="yes"
|
||||||
if test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then
|
fi
|
||||||
QT_LIB="qt-mt$QT_VER.lib"
|
;;
|
||||||
|
*-darwin*)
|
||||||
|
# determin static or dynamic -- prefer dynamic
|
||||||
|
QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.dylib 2> /dev/null`
|
||||||
|
if test "x$QT_IS_DYNAMIC" = x; then
|
||||||
|
QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
|
||||||
|
if test "x$QT_IS_STATIC" = x; then
|
||||||
QT_IS_STATIC="no"
|
QT_IS_STATIC="no"
|
||||||
QT_IS_MT="yes"
|
AC_MSG_ERROR([*** Couldn't find any Qt libraries])
|
||||||
|
|
||||||
elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then
|
|
||||||
QT_LIB="qt$QT_VER.lib"
|
|
||||||
QT_IS_STATIC="no"
|
|
||||||
QT_IS_MT="no"
|
|
||||||
elif test -f "$QTDIR/lib/qt.lib" ; then
|
|
||||||
QT_LIB="qt.lib"
|
|
||||||
QT_IS_STATIC="yes"
|
|
||||||
QT_IS_MT="no"
|
|
||||||
elif test -f "$QTDIR/lib/qt-mt.lib" ; then
|
|
||||||
QT_LIB="qt-mt.lib"
|
|
||||||
QT_IS_STATIC="yes"
|
|
||||||
QT_IS_MT="yes"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-darwin*)
|
|
||||||
# determin static or dynamic -- prefer dynamic
|
|
||||||
QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.dylib 2> /dev/null`
|
|
||||||
|
|
||||||
if test "x$QT_IS_DYNAMIC" = x; then
|
|
||||||
QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
|
|
||||||
if test "x$QT_IS_STATIC" = x; then
|
|
||||||
QT_IS_STATIC="no"
|
|
||||||
AC_MSG_ERROR([*** Couldn't find any Qt libraries])
|
|
||||||
else
|
|
||||||
QT_IS_STATIC="yes"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
QT_IS_STATIC="no"
|
QT_IS_STATIC="yes"
|
||||||
fi
|
fi
|
||||||
# set link parameters based on shared/mt libs or static lib
|
else
|
||||||
if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
|
QT_IS_STATIC="no"
|
||||||
QT_LIB="-lqt"
|
fi
|
||||||
QT_IS_MT="no"
|
# set link parameters based on shared/mt libs or static lib
|
||||||
elif test "x`ls $QTDIR/lib/libqt-mt.*.dylib 2> /dev/null`" != x ; then
|
if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
|
||||||
QT_LIB="-lqt-mt"
|
QT_LIB="-lqt"
|
||||||
QT_IS_MT="yes"
|
QT_IS_MT="no"
|
||||||
elif test "x`ls $QTDIR/lib/libqt.*.dylib 2> /dev/null`" != x ; then
|
elif test "x`ls $QTDIR/lib/libqt-mt.*.dylib 2> /dev/null`" != x ; then
|
||||||
QT_LIB="-lqt"
|
QT_LIB="-lqt-mt"
|
||||||
QT_IS_MT="no"
|
QT_IS_MT="yes"
|
||||||
elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
|
elif test "x`ls $QTDIR/lib/libqt.*.dylib 2> /dev/null`" != x ; then
|
||||||
QT_LIB="-lqte"
|
QT_LIB="-lqt"
|
||||||
QT_IS_MT="no"
|
QT_IS_MT="no"
|
||||||
QT_IS_EMBEDDED="yes"
|
elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
|
||||||
elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
|
QT_LIB="-lqte"
|
||||||
QT_LIB="-lqte-mt"
|
QT_IS_MT="no"
|
||||||
QT_IS_MT="yes"
|
QT_IS_EMBEDDED="yes"
|
||||||
QT_IS_EMBEDDED="yes"
|
elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
|
||||||
fi
|
QT_LIB="-lqte-mt"
|
||||||
;;
|
QT_IS_MT="yes"
|
||||||
*)
|
QT_IS_EMBEDDED="yes"
|
||||||
# determin static or dynamic -- prefer dynamic
|
fi
|
||||||
QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 2> /dev/null`
|
;;
|
||||||
|
*)
|
||||||
if test "x$QT_IS_DYNAMIC" = x; then
|
# determin static or dynamic -- prefer dynamic
|
||||||
QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
|
QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 2> /dev/null`
|
||||||
if test "x$QT_IS_STATIC" = x; then
|
if test "x$QT_IS_DYNAMIC" = x; then
|
||||||
QT_IS_STATIC="no"
|
QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
|
||||||
AC_MSG_ERROR([*** Couldn't find any Qt libraries])
|
if test "x$QT_IS_STATIC" = x; then
|
||||||
else
|
|
||||||
QT_IS_STATIC="yes"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
QT_IS_STATIC="no"
|
QT_IS_STATIC="no"
|
||||||
|
AC_MSG_ERROR([*** Couldn't find any Qt libraries])
|
||||||
|
else
|
||||||
|
QT_IS_STATIC="yes"
|
||||||
fi
|
fi
|
||||||
# set link parameters based on shared/mt libs or static lib
|
else
|
||||||
if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
|
QT_IS_STATIC="no"
|
||||||
QT_LIB="-lqt"
|
fi
|
||||||
QT_IS_MT="no"
|
# set link parameters based on shared/mt libs or static lib
|
||||||
elif test "x`ls $QTDIR/lib/libqt-mt.so* 2> /dev/null`" != x ; then
|
if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
|
||||||
QT_LIB="-lqt-mt"
|
QT_LIB="-lqt"
|
||||||
QT_IS_MT="yes"
|
QT_IS_MT="no"
|
||||||
elif test "x`ls $QTDIR/lib/libqt.so* 2> /dev/null`" != x ; then
|
elif test "x`ls $QTDIR/lib/libqt-mt.so* 2> /dev/null`" != x ; then
|
||||||
QT_LIB="-lqt"
|
QT_LIB="-lqt-mt"
|
||||||
QT_IS_MT="no"
|
QT_IS_MT="yes"
|
||||||
elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
|
elif test "x`ls $QTDIR/lib/libqt.so* 2> /dev/null`" != x ; then
|
||||||
QT_LIB="-lqte"
|
QT_LIB="-lqt"
|
||||||
QT_IS_MT="no"
|
QT_IS_MT="no"
|
||||||
QT_IS_EMBEDDED="yes"
|
elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
|
||||||
elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
|
QT_LIB="-lqte"
|
||||||
QT_LIB="-lqte-mt"
|
QT_IS_MT="no"
|
||||||
QT_IS_MT="yes"
|
QT_IS_EMBEDDED="yes"
|
||||||
QT_IS_EMBEDDED="yes"
|
elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
|
||||||
|
QT_LIB="-lqte-mt"
|
||||||
|
QT_IS_MT="yes"
|
||||||
|
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])
|
||||||
|
|
||||||
|
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
|
||||||
|
;;
|
||||||
|
|
||||||
|
*darwin*)
|
||||||
|
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
|
||||||
;;
|
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])
|
|
||||||
|
|
||||||
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
|
|
||||||
;;
|
|
||||||
|
|
||||||
*darwin*)
|
|
||||||
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_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
|
if test $QT_MAJOR = "3" ; then
|
||||||
if test $QT_IS_MT = yes ; then
|
QT_LIBS="$QT_LIBS qtmain.lib"
|
||||||
QT_LIBS="/nodefaultlib:libcmt"
|
|
||||||
else
|
|
||||||
QT_LIBS="/nodefaultlib:libc"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
if test $QT_IS_STATIC = yes ; then
|
QT_LIBS="$QT_LIBS $QT_LIB"
|
||||||
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
|
||||||
if test $QT_MAJOR = "3" ; then
|
QT_CXXFLAGS="$QT_CXXFLAGS -DQT_DLL"
|
||||||
QT_LIBS="$QT_LIBS qtmain.lib"
|
QT_LIBS="$QT_LIBS qtmain.lib qui.lib user32.lib netapi32.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
|
fi
|
||||||
QASSISTANTCLIENT_LDADD="qassistantclient.lib"
|
fi
|
||||||
;;
|
QASSISTANTCLIENT_LDADD="qassistantclient.lib"
|
||||||
esac
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test x"$QT_IS_EMBEDDED" = "xyes" ; then
|
if test x"$QT_IS_EMBEDDED" = "xyes" ; then
|
||||||
QT_CXXFLAGS="-DQWS $QT_CXXFLAGS"
|
QT_CXXFLAGS="-DQWS $QT_CXXFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$QT_IS_MT" = "xyes" ; then
|
if test x"$QT_IS_MT" = "xyes" ; then
|
||||||
QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
|
QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
QT_LDADD="-L$QTDIR/lib $QT_LIBS"
|
QT_LDADD="-L$QTDIR/lib $QT_LIBS"
|
||||||
|
|
||||||
if test x$QT_IS_STATIC = xyes ; then
|
if test x$QT_IS_STATIC = xyes ; then
|
||||||
OLDLIBS="$LIBS"
|
OLDLIBS="$LIBS"
|
||||||
LIBS="$QT_LDADD"
|
LIBS="$QT_LDADD"
|
||||||
AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft")
|
AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft")
|
||||||
LIBS="$LIBS"
|
LIBS="$LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([QT_CXXFLAGS])
|
AC_MSG_CHECKING([QT_CXXFLAGS])
|
||||||
AC_MSG_RESULT([$QT_CXXFLAGS])
|
AC_MSG_RESULT([$QT_CXXFLAGS])
|
||||||
AC_MSG_CHECKING([QT_LDADD])
|
AC_MSG_CHECKING([QT_LDADD])
|
||||||
AC_MSG_RESULT([$QT_LDADD])
|
AC_MSG_RESULT([$QT_LDADD])
|
||||||
|
|
||||||
AC_SUBST(QT_CXXFLAGS)
|
AC_SUBST(QT_CXXFLAGS)
|
||||||
AC_SUBST(QT_LDADD)
|
AC_SUBST(QT_LDADD)
|
||||||
AC_SUBST(QT_GUILINK)
|
AC_SUBST(QT_GUILINK)
|
||||||
AC_SUBST(QASSISTANTCLIENT_LDADD)
|
AC_SUBST(QASSISTANTCLIENT_LDADD)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|||||||
@ -14,11 +14,13 @@ i18ndir = ${pkgdatadir}/i18n
|
|||||||
|
|
||||||
nodist_i18n_DATA = \
|
nodist_i18n_DATA = \
|
||||||
qgis_de.qm \
|
qgis_de.qm \
|
||||||
qgis_pt.qm
|
qgis_pt.qm \
|
||||||
|
qgis_se.qm
|
||||||
|
|
||||||
i18n_SOURCES = \
|
i18n_SOURCES = \
|
||||||
qgis_de.ts \
|
qgis_de.ts \
|
||||||
qgis_pt.ts
|
qgis_pt.ts \
|
||||||
|
qgis_se.ts
|
||||||
|
|
||||||
%.qm: %.ts
|
%.qm: %.ts
|
||||||
cd ..; ./create_qm_files.sh
|
cd ..; ./create_qm_files.sh
|
||||||
|
|||||||
2837
i18n/qgis_se.ts
Normal file
2837
i18n/qgis_se.ts
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,8 @@
|
|||||||
# Check for working QGIS
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl QGIS
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Check for QGIS compiler and linker flags
|
||||||
# Jens Oberender <j.obi@troja.net> 2004
|
# Jens Oberender <j.obi@troja.net> 2004
|
||||||
|
|
||||||
AC_DEFUN([AQ_CHECK_QGIS],
|
AC_DEFUN([AQ_CHECK_QGIS],
|
||||||
@ -8,16 +12,14 @@ dnl Get the cflags and libraries from qgis-config
|
|||||||
dnl
|
dnl
|
||||||
AC_ARG_WITH([qgis],
|
AC_ARG_WITH([qgis],
|
||||||
AC_HELP_STRING([--with-qgis=path],
|
AC_HELP_STRING([--with-qgis=path],
|
||||||
[Full path to 'qgis-config', e.g. '--with-qgis=/usr/local/bin/qgis-config]),
|
[Full path to 'qgis-config', e.g. --with-qgis=/usr/local/bin/qgis-config]),
|
||||||
[ac_qgis_config_path=$withval])
|
[ac_qgis_config_path=$withval])
|
||||||
|
|
||||||
if test x"$ac_qgis_config_path" = x ; then
|
if test x"$ac_qgis_config_path" = x ; then
|
||||||
ac_qgis_config_path=`which qgis-config`
|
ac_qgis_config_path=`which qgis-config`
|
||||||
if test x"$ac_qgis_config_path" = x ; then
|
|
||||||
ac_qgis_config_path=`dirname $ac_qgis_config_path`
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ac_qgis_config_path=`dirname $ac_qgis_config_path 2> /dev/null`
|
||||||
AC_PATH_PROG(QGIS_CONFIG, qgis-config, no, $ac_qgis_config_path)
|
AC_PATH_PROG(QGIS_CONFIG, qgis-config, no, $ac_qgis_config_path)
|
||||||
|
|
||||||
if test x"$QGIS_CONFIG" = xno ; then
|
if test x"$QGIS_CONFIG" = xno ; then
|
||||||
@ -27,9 +29,9 @@ if test x"$QGIS_CONFIG" = xno ; then
|
|||||||
AC_MSG_ERROR([qgis-config not found! Supply a path with --with-qgis=PATH])
|
AC_MSG_ERROR([qgis-config not found! Supply a path with --with-qgis=PATH])
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_CHECKING([QGIS_CFLAGS])
|
AC_MSG_CHECKING([QGIS_CXXFLAGS])
|
||||||
QGIS_CFLAGS=`$QGIS_CONFIG --cflags`
|
QGIS_CXXFLAGS=`$QGIS_CONFIG --cflags`
|
||||||
AC_MSG_RESULT($QGIS_CFLAGS)
|
AC_MSG_RESULT($QGIS_CXXFLAGS)
|
||||||
|
|
||||||
AC_MSG_CHECKING([QGIS_LDADD])
|
AC_MSG_CHECKING([QGIS_LDADD])
|
||||||
QGIS_LDADD=`$QGIS_CONFIG --libs`
|
QGIS_LDADD=`$QGIS_CONFIG --libs`
|
||||||
@ -37,8 +39,8 @@ else
|
|||||||
|
|
||||||
ac_save_CXXFLAGS="$CXXFLAGS"
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
||||||
ac_save_LDFLAGS="$LDFLAGS"
|
ac_save_LDFLAGS="$LDFLAGS"
|
||||||
CXXFLAGS="$CXXFLAGS $QGIS_CFLAGS"
|
CXXFLAGS="$CXXFLAGS $QGIS_CXXFLAGS $QT_CXXFLAGS"
|
||||||
LDFLAGS="$QGIS_LDADD $QT_LDADD $GDAL_LDADD /Users/didge/lib/libqgis.dylib $LDFLAGS"
|
LDFLAGS="$LDFLAGS $QGIS_LDADD $QT_LDADD $GDAL_LDADD"
|
||||||
|
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
*darwin*)
|
*darwin*)
|
||||||
@ -64,6 +66,6 @@ else
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(QGIS_CFLAGS)
|
AC_SUBST(QGIS_CXXFLAGS)
|
||||||
AC_SUBST(QGIS_LDADD)
|
AC_SUBST(QGIS_LDADD)
|
||||||
])
|
])
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user