Make znc-buildmod work with znc-config not in path

We do that by adding the path we installed znc-config to, to our $PATH in
znc-buildmod.

This patch requires znc-buildmod to be moved to znc-buildmod.in, but svn
doesn't want me to do that :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1054 726aef4b-f618-498e-8847-2d620e286838

configure

@@ -3912,6 +3912,8 @@ ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files znc-config"
 
+ac_config_files="$ac_config_files znc-buildmod"
+
 if test "$MODULES" = "yes"; then
 	ac_config_files="$ac_config_files modules/Makefile"
 
@@ -4485,6 +4487,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "znc-config") CONFIG_FILES="$CONFIG_FILES znc-config" ;;
+    "znc-buildmod") CONFIG_FILES="$CONFIG_FILES znc-buildmod" ;;
     "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

configure.in

@@ -199,6 +199,7 @@ AC_SUBST([MODDIR])
 AC_SUBST([DATADIR])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([znc-config])
+AC_CONFIG_FILES([znc-buildmod])
 if test "$MODULES" = "yes"; then
 	AC_CONFIG_FILES([modules/Makefile])
 fi

znc-buildmod

@@ -22,6 +22,13 @@ OK="${BOLD}${BLUE}[${GREEN} ok ${BLUE}]${NORMAL}${UNBOLD}"
 
 PROGRESS="${BOLD}${BLUE}[    ]${NORMAL}${UNBOLD}"
 
+# Update $PATH so that we will also find the znc binary if we were compiled
+# with  ./configure --prefix=/some/path
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+bindir="@bindir@"
+PATH="$PATH:$bindir"
+
 # Check if we got everything we need
 
 SED=sed

znc-config.in

@@ -2,8 +2,9 @@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
-datadir="@datadir@"
 datarootdir="@datarootdir@"
+bindir="@bindir@"
+datadir="@datadir@"
 
 CXXFLAGS="@MODFLAGS@"
 INCLUDES="-I@prefix@/include/znc @INCLUDES@"