[Ptpd-commit] SF.net SVN: ptpd:[292] branches/hms-autotools

[<ha...@us...>]

Revision: 292
          http://sourceforge.net/p/ptpd/code/292
Author:   harlan
Date:     2012-11-25 00:02:23 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
snmp cleanup

Modified Paths:
--------------
    branches/hms-autotools/configure.ac
    branches/hms-autotools/src/Makefile.am

Modified: branches/hms-autotools/configure.ac
===================================================================
--- branches/hms-autotools/configure.ac	2012-11-24 12:37:14 UTC (rev 291)
+++ branches/hms-autotools/configure.ac	2012-11-25 00:02:23 UTC (rev 292)
@@ -204,6 +204,7 @@
     esac
     ;;
 esac
+AC_SUBST(PTP_DBL)
 
 AC_MSG_CHECKING([for daemon mode])
 AC_ARG_ENABLE(
@@ -221,6 +222,7 @@
     PTP_DAEMON="-DPTPD_NO_DAEMON"
     ;;
 esac
+AC_SUBST(PTP_DAEMON)
 
 AC_MSG_CHECKING([for experimental options])
 AC_ARG_ENABLE(
@@ -238,6 +240,7 @@
     PTP_EXP="-DPTPD_EXPERIMENTAL"
     ;;
 esac
+AC_SUBST(PTP_EXP)
 
 AC_MSG_CHECKING([for SIGUSR2 support])
 AC_ARG_ENABLE(
@@ -259,11 +262,8 @@
     PTP_SIGUSR2="-DDBG_SIGUSR2_CHANGE_DEBUG"
     ;;
 esac
+AC_SUBST(PTP_SIGUSR2)
 
-# HMS: I think we want to AC_SUBST the PTP_* variables instead...
-AM_CPPFLAGS="$PTP_DBL $PTP_DAEMON $PTP_EXP $PTP_SNMP $PTP_SIGUSR2"
-AC_SUBST(AM_CPPFLAGS)
-
 AC_CONFIG_FILES([Makefile
                  src/Makefile])
 AC_OUTPUT

Modified: branches/hms-autotools/src/Makefile.am
===================================================================
--- branches/hms-autotools/src/Makefile.am	2012-11-24 12:37:14 UTC (rev 291)
+++ branches/hms-autotools/src/Makefile.am	2012-11-25 00:02:23 UTC (rev 292)
@@ -3,10 +3,12 @@
 lib_LTLIBRARIES = $(LIBPTPD2_LIBS_LA)
 bin_PROGRAMS = ptpd2
 
-AM_CFLAGS	= ${SNMP_CFLAGS}
-AM_CPPFLAGS	= ${SNMP_CPPFLAGS}
-AM_LDFLAGS	= ${SNMP_LIBS}
+AM_CFLAGS	= $SNMP_CFLAGS
+AM_CPPFLAGS	= $SNMP_CPPFLAGS
+AM_LDFLAGS	= $SNMP_LIBS
 
+AM_CPPFLAGS	+= $PTP_DBL $PTP_DAEMON $PTP_EXP $PTP_SNMP $PTP_SIGUSR2
+
 NULL=
 
 #VERSION = 2.3.0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.