diff --git a/autogen.sh b/autogen.sh index 016a131c..8f1b1ab1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,7 +16,7 @@ run_cmd() { "$@" || exit $! } -run_cmd libtoolize --copy --force +# run_cmd libtoolize --copy --force run_cmd intltoolize --copy --force echo "sed -e s/@GETTEXT_PACKAGE@/moo-gsv/ po/Makefile.in.in > po-gsv/Makefile.in.in" diff --git a/configure.ac b/configure.ac index 7327d31a..0cd7e38d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(ACLOCAL_FLAGS) AM_INIT_AUTOMAKE([1.11 silent-rules foreign dist-bzip2 dist-zip no-dist-gzip]) -LT_INIT([disable-shared]) +# LT_INIT([disable-shared]) AC_ARG_ENABLE(release, AC_HELP_STRING([--enable-release],[assume it's a release build]),[ @@ -71,7 +71,7 @@ AH_TOP([#ifndef __CONFIG_H__ AH_BOTTOM([#include #endif // __CONFIG_H__]) -LT_LIB_M +MOO_LT_LIB_M AC_DEFINE(MOO_BUILD_APP,[1],[MOO_BUILD_APP]) AC_DEFINE(MOO_BUILD_EDIT,[1],[MOO_BUILD_EDIT]) diff --git a/m4/moo-os.m4 b/m4/moo-os.m4 index 8be84380..e8d77b99 100644 --- a/m4/moo-os.m4 +++ b/m4/moo-os.m4 @@ -43,3 +43,22 @@ AM_CONDITIONAL(MOO_OS_[]_moo_os_,[$MOO_OS_[]_moo_os_]) ]) ]) + +# LT_LIB_M macro from libtool.m4 +AC_DEFUN([MOO_LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M diff --git a/moo.mprj b/moo.mprj deleted file mode 100644 index 8b398072..00000000 --- a/moo.mprj +++ /dev/null @@ -1,70 +0,0 @@ - - - debug - - - build/debug - - --enable-debug --enable-all-warnings --enable-project --enable-unit-tests --prefix=${PREFIX:-/usr/local} - - gcc-4.2 - -g - g++-4.2 - -g - - - - - /home/muntyan/projects/gtk-2.10/moo - - --configure-manually - - - - /home/muntyan/projects/gtk-2.6/moo - - --enable-debug --enable-all-warnings --prefix=$PREFIX --enable-unit-tests --enable-project - - - - /home/muntyan/projects/gtk/build/moo - - --enable-debug --enable-all-warnings --prefix=$PREFIX --enable-unit-tests --enable-project - - - - build/mingw - - - - - - build/optimized - - --enable-all-warnings - - -O2 -g - -O2 -g - - - - - build/pida - - --enable-debug --enable-all-warnings --enable-moo-module --disable-medit - - gcc-4.2 - -g - - - - - - --app-name foobar - medit/medit - - ru - misc - - -