additional feature: built in library name; plus: closes #70

swisssurfer/configure.in

@@ -28,6 +28,7 @@ AC_CONFIG_FILES(makefile
                 src/makefile src/qmake.pro src/languages.qrc
                 doc/doxyfile doc/makefile)
 
+# copy M4 to shell
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(LEAST)
@@ -35,7 +36,7 @@ AC_SUBST(BUILDDATE)
 
 # libtool versioning
 LIB_MAJOR=m4_eval(x_major+x_minor)
-LIB_MINOR=x_least
+LIB_MINOR=${LEAST}
 LIB_LEAST=x_minor
 LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
 AC_SUBST(LIB_VERSION)
@@ -87,41 +88,15 @@ AC_SUBST(LRELEASE)
 AC_CHECK_PROGS([LUPDATE], [lupdate-qt4 lupdate-mac lupdate])
 test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt 4 not found!])
 AC_SUBST(LUPDATE)
-AC_ARG_ENABLE(static-plugins,
-  [AS_HELP_STRING([--enable-static-plugins],
-                  [links the image plugins statically])],
-  [static_plugins="$enableval"], [static_plugins="no"])
-#AM_CONDITIONAL(STATIC_PLUGINS, test "$static_plugins" = "yes")
-if test "$static_plugins" = "yes"; then
-  CXXFLAGS+=" -DPLUGINS=static"
-  STATIC_QTPLUGINS="qgif qjpeg qmng"
-  STATIC_QCONFIG="static"
-else
-  CXXFLAGS+=" -DPLUGINS=dynamic"
-  STATIC_QTPLUGINS=
-  STATIC_QCONFIG=
-fi
-AC_ARG_ENABLE(win,
-  [AS_HELP_STRING([--enable-win],
-                  [on linux, also builds windows version using mingw])],
-  [build_win="$enableval"], [build_win="no"])
-AM_CONDITIONAL(BUILD_WIN, test "$build_win" = "yes")
-AC_ARG_ENABLE(32bit-linux,
-  [AS_HELP_STRING([--enable-32bit-linux],
-                  [build for 32bit linux instead of plattform specific])],
-  [build_lin32="$enableval"], [build_lin32="no"])
-AM_CONDITIONAL(BUILD_LIN32, test "$build_lin32" = "yes")
 
 # Environment Variables
 AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete])
-AC_PATH_PROG(QMAKE, [qmake qmake-qt4], [])
-AC_ARG_VAR(QMAKE, [path to qmake program])
-
-# Enviropnment Variables
 AC_ARG_VAR(EDITION, [name of the edition, e.g. comol])
 AC_ARG_VAR(EDITION_USERFRIENDLY, [userfriendly name of the edition, e.g. CoMoL])
 AC_ARG_VAR(BUILDVERSION, [version of this build, e.g. v1.0])
 AC_ARG_VAR(BUILD, [build number of this build, e.g. 213])
+AC_PATH_PROG(QMAKE, [qmake qmake-qt4], [])
+AC_ARG_VAR(QMAKE, [path to qmake program])
 
 # export macros
 SRCDIR=${srcdir}
@@ -135,27 +110,6 @@ AC_SUBST(PACKAGENAME)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(LIBS)
-AC_SUBST(QMAKE_OPTIONS)
-AC_SUBST(STATIC_QTPLUGINS)
-AC_SUBST(STATIC_QCONFIG)
-
-AC_CHECK_HEADER(xml-cxx/xml.hxx, [found="yes"], [found="no"])
-if test "$found" == "no"; then
-  AC_MSG_CHECKING([looking for xml-cxx headers])
-  for file in /usr/include /usr/local/include /opt/include \
-              /opt/local/include; do
-    if test -d ${file}/xml-cxx; then
-      CPPFLAGS+=" -I$file"
-      LDFLAGS+=" -L$(echo $file | sed 's#/include#/lib#g')"
-      found=$file
-      break;
-    fi
-  done
-  AC_MSG_RESULT([$found])
-fi
-if test "$found" == "no"; then
-  AC_MSG_ERROR([libxml-cxx not found])
-fi
 
 # create output
 AC_OUTPUT
@@ -183,11 +137,3 @@ AC_MSG_NOTICE([Pedantic compile mode enabled!
   - all warnings for GNU g++ are enabled
   - all warnings result in an error
   - doxygen warnings are treated as error too]); fi
-if test "$build_win" == "yes"; then
-AC_MSG_NOTICE([Will cross-compile for windows
-  Requires:
-    - mingw32, mingw32-binutils, mingw32-runtime
-      - i586-mingw32msvc-g++, i586-mingw32msvc-ar,
-        i586-mingw32msvc-windres, i586-mingw32msvc-strip
-    - Boost for MinGW in ~/.wine/drive_c/Programme/Boost-1.34.1
-    - Qt for MinGW in ~/.wine/drive_c/Qt/4.4.3]); fi