added swedish translation

updated qgis.m4 and configure stuff


git-svn-id: http://svn.osgeo.org/qgis/trunk@1225 c8812cc2-4d05-0410-92ff-de0c093fc19c

acinclude.m4

@@ -2,7 +2,8 @@ dnl ---------------------------------------------------------------------------
 dnl GDAL/OGR
 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_ARG_WITH([gdal],
@@ -14,7 +15,7 @@ AC_DEFUN([AQ_CHECK_GDAL],
   ac_gdal_config_path=`which gdal-config`
 fi
 
-  ac_gdal_config_path=`dirname $ac_gdal_config_path`
+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
@@ -25,7 +26,6 @@ AC_DEFUN([AQ_CHECK_GDAL],
     AC_MSG_ERROR([GDAL must be compiled with OGR support and currently is not.])
   fi
   AC_MSG_RESULT(yes)
-
   AC_MSG_CHECKING([GDAL_CFLAGS])
   GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
   AC_MSG_RESULT($GDAL_CFLAGS)
@@ -41,7 +41,12 @@ AC_DEFUN([AQ_CHECK_GDAL],
 AC_SUBST(GDAL_LDADD)
 ])
 
+dnl ---------------------------------------------------------------------------
+dnl QT3
+dnl ---------------------------------------------------------------------------
+
 # Check for Qt compiler flags, linker flags, and binary packages
+
 AC_DEFUN([AQ_CHECK_QT],
 [
 AC_REQUIRE([AC_PROG_CXX])
@@ -102,21 +107,17 @@ AC_DEFUN([AQ_CHECK_QT],
 if test x$MOC = x ; then
   AC_MSG_ERROR([*** moc must be in path])
 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
 
@@ -143,11 +144,9 @@ AC_DEFUN([AQ_CHECK_QT],
       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
@@ -182,7 +181,6 @@ AC_DEFUN([AQ_CHECK_QT],
   *)
     # determin static or dynamic -- prefer dynamic
     QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 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
@@ -265,7 +263,6 @@ AC_DEFUN([AQ_CHECK_QT],
   *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"
@@ -317,3 +314,4 @@ AC_DEFUN([AQ_CHECK_QT],
 AC_SUBST(QT_GUILINK)
 AC_SUBST(QASSISTANTCLIENT_LDADD)
 ])
+

i18n/Makefile.am

@@ -14,11 +14,13 @@ i18ndir = ${pkgdatadir}/i18n
 
 nodist_i18n_DATA = \
 	qgis_de.qm \
-	qgis_pt.qm
+	qgis_pt.qm \
+	qgis_se.qm
 
 i18n_SOURCES = \
 	qgis_de.ts \
-	qgis_pt.ts
+	qgis_pt.ts \
+	qgis_se.ts
 
 %.qm: %.ts
 	cd ..; ./create_qm_files.sh

tools/qgisdetect.m4

@@ -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
 
 AC_DEFUN([AQ_CHECK_QGIS],
@@ -8,16 +12,14 @@ dnl Get the cflags and libraries from qgis-config
 dnl
 AC_ARG_WITH([qgis],
 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])
 
 if test x"$ac_qgis_config_path" = x ; then
   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
 
+ac_qgis_config_path=`dirname $ac_qgis_config_path 2> /dev/null`
 AC_PATH_PROG(QGIS_CONFIG, qgis-config, no, $ac_qgis_config_path)
 
 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])
   fi
 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])
   QGIS_LDADD=`$QGIS_CONFIG --libs`
@@ -37,8 +39,8 @@ else
 
   ac_save_CXXFLAGS="$CXXFLAGS"
   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
     *darwin*)
@@ -64,6 +66,6 @@ else
   fi
 fi
 
-AC_SUBST(QGIS_CFLAGS)
+AC_SUBST(QGIS_CXXFLAGS)
 AC_SUBST(QGIS_LDADD)
 ])