cvs: embed /php-irssi Makefile.am config.m4

wez Wed Jan 29 16:10:53 2003 EDT Modified files: /embed/php-irssi Makefile.am config.m4 Log: Some more build fixes so that the module will run when libphp4.so is not installed into a dir covered by the normal system library path. Index: embed/php-irssi/Makefile.am diff -u embed/php-irssi/Makefile.am:1.1.1.1 embed/php-irssi/Makefile.am:1.2 --- embed/php-irssi/Makefile.am:1.1.1.1 Wed Jan 29 13:42:34 2003 +++ embed/php-irssi/Makefile.am Wed Jan 29 16:10:53 2003 @@ -5,8 +5,8 @@ module_LTLIBRARIES = libphp_core.la -libphp_core_la_LDFLAGS = -avoid-version -rpath $(moduledir) -libphp_core_la_LIBADD = $(LIBPHP_LDFLAGS) -lphp4 +libphp_core_la_LDFLAGS = -avoid-version -Wl,--rpath -Wl,$(LIBPHP_PREFIX)/lib -L$(LIBPHP_PREFIX)/lib +libphp_core_la_LIBADD = -lphp4 $(LIBPHP_LIBS) $(LIBPHP_LDFLAGS) INCLUDES = \ -I$(top_srcdir)/src \ @@ -15,7 +15,7 @@ -I$(top_srcdir)/src/irc/core \ $(GLIB_CFLAGS) \ -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \ - $(PHP_CFLAGS) + $(LIBPHP_CFLAGS) libphp_core_la_SOURCES = \ php-core.c ext-irssi.c Index: embed/php-irssi/config.m4 diff -u embed/php-irssi/config.m4:1.1 embed/php-irssi/config.m4:1.2 --- embed/php-irssi/config.m4:1.1 Wed Jan 29 15:34:57 2003 +++ embed/php-irssi/config.m4 Wed Jan 29 16:10:53 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2003/01/29 20:34:57 wez Exp $ +dnl $Id: config.m4,v 1.2 2003/01/29 21:10:53 wez Exp $ dnl A Fragment only for now, but could be expanded so php-irssi can dnl be built independently from the irssi source tree. @@ -13,11 +13,15 @@ fi want_php=yes - LIBPHP_LDFLAGS="-L$PHPCONFIG --prefix/lib $PHPCONFIG --libs $PHPCONFIG --ldflags" - PHP_CFLAGS=$PHPCONFIG --includes + LIBPHP_PREFIX="$PHPCONFIG --prefix" + LIBPHP_LIBS="$PHPCONFIG --libs" + LIBPHP_LDFLAGS="$PHPCONFIG --ldflags" + LIBPHP_CFLAGS=$PHPCONFIG --includes ) +AC_SUBST(LIBPHP_LIBS) +AC_SUBST(LIBPHP_CFLAGS) +AC_SUBST(LIBPHP_PREFIX) AC_SUBST(LIBPHP_LDFLAGS) -AC_SUBST(PHP_CFLAGS) - +AC_SUBST(PHPCONFIG) AM_CONDITIONAL(HAVE_PHP, test "$want_php" != "no")