From 6b94181466bbf5a412e4e7753a7c41b13f34d6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 19 Oct 2007 14:48:19 +0000 Subject: [PATCH] Apply most of the patch from #1794250 (thanks): Remove compiler specific flags. Add configure option to specify the path to libvte.so. Remove many unnecessary configure checks. Stop configure if msgfmt was not found(gettext not installed). git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1961 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 12 ++++++++ configure.in | 64 +++++++++++------------------------------- doc/geany.html | 20 +++++++------ doc/geany.txt | 15 ++++++---- plugins/Makefile.am | 6 ---- scintilla/Makefile.am | 8 +----- scintilla/PlatGTK.cxx | 14 ++++----- src/gb.c | 2 +- src/project.c | 8 +++--- src/vte.c | 9 +++++- tagmanager/Makefile.am | 5 ---- 11 files changed, 70 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index c50bf067..be2f5445 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-10-19 Enrico Tröger + + * configure.in, doc/geany.html, doc/geany.txt, plugins/Makefile.am, + scintilla/Makefile.am, scintilla/PlatGTK.cxx, src/gb.c, + src/project.c, src/vte.c, tagmanager/Makefile.am: + Apply most of the patch from #1794250 (thanks): + Remove compiler specific flags. + Add configure option to specify the path to libvte.so. + Remove many unnecessary configure checks. + Stop configure if msgfmt was not found(gettext not installed). + + 2007-10-18 Enrico Tröger * src/plugindata.h, src/plugins.c: diff --git a/configure.in b/configure.in index f07efe01..cbc875c9 100644 --- a/configure.in +++ b/configure.in @@ -11,16 +11,11 @@ AC_AIX AC_MINIX AC_PROG_CC -AM_CONDITIONAL(IS_COMPILER_GCC,test x$SSC == x) -AM_PROG_CC_STDC -AC_HEADER_STDC AC_PROG_CXX -AC_PROG_CPP #AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S -AC_PROG_MAKE_SET AC_PROG_INTLTOOL # for plugins @@ -31,35 +26,16 @@ LIBTOOL="$LIBTOOL --silent" # autoscan start # Checks for header files. -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h libintl.h limits.h stddef.h stdlib.h string.h sys/time.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STAT -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_HEADER_TIME AC_STRUCT_TM -AC_C_VOLATILE # Checks for library functions. -AC_FUNC_CLOSEDIR_VOID -AC_FUNC_ERROR_AT_LINE -#AC_REPLACE_FNMATCH -AC_FUNC_LSTAT -AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_FUNC_MALLOC -AC_FUNC_MEMCMP -AC_FUNC_REALLOC -AC_TYPE_SIGNAL -AC_FUNC_STAT -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([gethostname ftruncate fgetpos getcwd gettimeofday isascii mblen memset mkstemp putenv realpath regcomp setenv strcasecmp strchr strdup strerror strrchr strspn strstr strtol]) +AC_CHECK_FUNCS([gethostname ftruncate fgetpos getcwd isascii mblen memset mkstemp realpath regcomp strcasecmp strchr strdup strerror strrchr strstr strtol]) # autoscan end @@ -77,8 +53,8 @@ fi AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number]) # GTK checks -pkg_modules="gtk+-2.0 >= 2.6.0" -PKG_CHECK_MODULES(GTK, [$pkg_modules]) +gtk_modules="gtk+-2.0 >= 2.6.0" +PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) @@ -97,17 +73,16 @@ if test "x$want_socket" = "xyes"; then fi # VTE support -AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],[enable if you want virtual termninal support [[default=yes]]]), +AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte], + [enable if you want virtual termninal support [[default=yes]]]), [want_vte="$enableval"], [want_vte="yes"]) +if test "x$want_vte" = "xyes"; then + AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) +fi +AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH], + [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH], + ["$withval"], [Path to a loadable libvte])]) -# if test "$want_vte" = "yes"; then -# PKG_CHECK_MODULES(VTE, [vte], -# [AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])], -# [AC_MSG_ERROR([VTE support enabled, but VTE not found])]) -# AC_CHECK_LIB(vte, vte_terminal_new, -# [AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])], -# [AC_MSG_ERROR([VTE support enabled, but VTE not found])], []) -# fi # Plugins support AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes) @@ -120,17 +95,17 @@ else fi # Check for random number paths (skip when cross compiling) -if test "x$build" = "x$target"; then +if test "x$build" = "x$host"; then AC_CHECK_FILE([/dev/urandom], AC_DEFINE([HAVE_DEVURANDOM], [1], [Define that you found /dev/urandom])) AC_CHECK_FILE([/dev/random], AC_DEFINE([HAVE_DEVRANDOM], [1], [Define that you found /dev/random])) fi -if test "x$target" = "xi386-mingw32msvc"; then +if test "x$host" = "xi386-mingw32msvc"; then AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32]) want_vte="no" AC_EXEEXT fi -AM_CONDITIONAL(MINGW, test "x$target" = "xi386-mingw32msvc") +AM_CONDITIONAL(MINGW, test "x$host" = "xi386-mingw32msvc") GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` @@ -153,6 +128,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS AM_GLIB_GNU_GETTEXT +if test "x$MSGFMT" = "xno"; then + AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) +fi # Set ${datadir} @@ -161,14 +139,6 @@ if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/sh prefix=${ac_default_prefix} fi fi -# check for datarootdir (autoconf >= 2.60), if not set(autoconf < 2.60), define it -if test "x${datarootdir}" = "x"; then - datarootdir=${datadir} -fi - -if test "x$want_vte" = "xyes"; then - AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) -fi GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps` AC_SUBST(GEANY_PIXMAPS_DIR) diff --git a/doc/geany.html b/doc/geany.html index f5268a2b..ada2f789 100644 --- a/doc/geany.html +++ b/doc/geany.html @@ -6,7 +6,7 @@ Geany - +