Commit 83d034d4 authored by Murray Cumming's avatar Murray Cumming Committed by Murray Cumming
Browse files

Put the mm libs and cflags before the pcre ones, because the mm ones are

2004-04-10  Murray Cumming  <murrayc@murrayc.com>

        * regexxer/Makefile.am: Put the mm libs and cflags before the pcre
        ones, because the mm ones are more likely to be in more than one
        prefix, to avoid undefined symbols when a -L command means we link
        to an older GTK+. This is a bit hacky, but I don't know a better
        solution - at least it will work on distros where everything is in the
        same prefix.
        * scripts/cxx.m4: Replace deprecated AC_HELP_STRING with
        AS_HELP_STRING.
parent edbedef7
0.7.0:
2004-04-10 Murray Cumming <murrayc@murrayc.com>
* regexxer/Makefile.am: Put the mm libs and cflags before the pcre
ones, because the mm ones are more likely to be in more than one
prefix, to avoid undefined symbols when a -L command means we link
to an older GTK+. This is a bit hacky, but I don't know a better
solution - at least it will work on distros where everything is in the
same prefix.
* scripts/cxx.m4: Replace deprecated AC_HELP_STRING with
AS_HELP_STRING.
2004-04-04 Murray Cumming <murrayc@murrayc.com>
* Ported to gtkmm 2.4 - mostly just use of libsigc++ 2 syntax, and
......
......@@ -18,8 +18,8 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
AC_INIT([regexxer], [0.6], [daniel.elstner@gmx.net], [regexxer])
AC_PREREQ([2.53])
AC_INIT([regexxer],[0.6],[daniel.elstner@gmx.net],[regexxer])
AC_PREREQ(2.59)
AC_REVISION([$Revision$])
AC_CONFIG_SRCDIR([src/pcreshell.cc])
......@@ -34,9 +34,9 @@ AC_CHECK_HEADERS([sys/types.h sys/stat.h])
AC_CHECK_FUNCS([umask])
AC_CHECK_TYPES([mode_t])
PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.3.7 gconfmm-2.6 >= 2.5.0 gnome-vfsmm-2.6 >= 2.5.0])
AC_SUBST([GTKMM_CFLAGS])
AC_SUBST([GTKMM_LIBS])
PKG_CHECK_MODULES([MM_DEPS], [gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 gnome-vfsmm-2.6 >= 2.6.0])
AC_SUBST([MM_DEPS_CFLAGS])
AC_SUBST([MM_DEPS_LIBS])
gdk_pixbuf_exec_prefix=`${PKG_CONFIG:-"pkg-config"} --variable=exec_prefix gdk-pixbuf-2.0 2>&5`
prog_search_path=${gdk_pixbuf_exec_prefix:+"$gdk_pixbuf_exec_prefix/bin$PATH_SEPARATOR"}$PATH
......@@ -64,5 +64,6 @@ AC_CONFIG_FILES([
src/Makefile
])
AC_OUTPUT()
AC_OUTPUT
......@@ -62,12 +62,12 @@ AC_DEFUN([REGEXXER_ARG_ENABLE_WARNINGS],
[
AC_REQUIRE([AC_PROG_CXX])
AC_ARG_ENABLE([warnings], AC_HELP_STRING(
AC_ARG_ENABLE([warnings], AS_HELP_STRING(
[--enable-warnings=@<:@none|minimum|maximum|hardcore@:>@],
[Control compiler pickyness. @<:@default=minimum@:>@]),
[regexxer_enable_warnings=$enableval],
[regexxer_enable_warnings=minimum])
AC_MSG_CHECKING([for compiler warning flags to use])
warning_flags=
......
......@@ -65,6 +65,6 @@ DEFS = @DEFS@ \
-DREGEXXER_DATADIR=\""$(datadir)"\"
regexxer_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PCRE_CFLAGS) $(GTKMM_CFLAGS)
regexxer_LDADD = $(PCRE_LIBS) $(GTKMM_LIBS)
regexxer_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(MM_DEPS_CFLAGS) $(PCRE_CFLAGS)
regexxer_LDADD = $(MM_DEPS_LIBS) $(PCRE_LIBS)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment