updated Makefile and configure for new .def paths

Makefile.am

@@ -38,9 +38,11 @@ dist-hook: ChangeLog
 	@echo "check fails upgrade the included libopts."
 	@echo "*****************************************************************"
 	test "$(SKIP_LIBOPTS_CHECK)" = "1" || test "`autoopts-config libsrc|cut -d '-' -f 2|sed 's/.tar.gz//'`" = "`cat $(srcdir)/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
-	cd $(distdir)/src/ && for i in ocserv-args.def ocpasswd-args.def;do \
+	for dir in $(distdir)/src/ $(distdir)/src/occtl/;do \
-		$(AUTOGEN) $$i; \
+		( cd $$dir && for i in *args.def;do \
-	done
+			$(AUTOGEN) $$i; \
-	cd $(distdir)/src/ && for i in *-args.c *-args.h;do \
+		done && \
-		mv $$i $$i.bak; \
+		for i in *args.c *args.h;do \
+			mv $$i $$i.bak; \
+		done ) \
 	done

configure.ac

@@ -459,9 +459,9 @@ AM_CONDITIONAL(PCL, test "$with_local_pcl" = no)
 LIBOPTS_CHECK([libopts])
 if test "$NEED_LIBOPTS_DIR" = "true";then
 	dnl create libopts-generated files
-	for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+	for i in ${srcdir}/src/*args.c.bak ${srcdir}/src/*args.h.bak ${srcdir}/src/occtl/*args.c.bak ${srcdir}/src/occtl/*args.h.bak; do
 		nam=`echo $i|sed 's/.bak//g'`
-		if [ test -f $i ];then
+		if test -f "$i";then
 			cp -f $i $nam
 		fi
 	done