libopts cleanup

bk: 43117af7bESkZA91jl0CbdLjCWEc6Q

diff --git a/Makefile.am b/Makefile.am
index ba4e8ab5271063156ace3c001513f411592f8c3e..9606044016582201bb963dfc79415bd98b964967 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,6 @@
 AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.5
 ACLOCAL_AMFLAGS= -I m4
 
-#include $(srcdir)/sntp/libopts/MakeDefs.inc
-
 SUBDIRS=
 if NEED_LIBOPTS
 SUBDIRS+= sntp/libopts

diff --git a/configure.ac b/configure.ac
index af1606154c5b88e5d5944cde8f7e215df411835b..fdaba5eebae3c41018021098e3d028ae45cfcfc4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ esac
 
 AMU_OS_CFLAGS
 
-LIBOPTS_CHECK
+LIBOPTS_CHECK(sntp/libopts)
 
 AC_MSG_CHECKING(for bin subdirectory)
 AC_ARG_WITH(binsubdir,

diff --git a/m4/libopts.m4 b/m4/libopts.m4
index 1f991af2025cb03d4ea012286223cd9c283cca41..edc12c3472e067dd2dd5ae5fa0aac0d4eaa06cec 100644 (file)
--- a/m4/libopts.m4
+++ b/m4/libopts.m4
@@ -370,13 +370,15 @@ dnl Default to system libopts
 NEED_LIBOPTS_DIR=''
 
 AC_DEFUN([LIBOPTS_CHECK],[
+  m4_pushdef([AO_Libopts_Dir],
+    [ifelse([$1], , [libopts], [$1])])
   AC_ARG_ENABLE([local-libopts],
     AC_HELP_STRING([--enable-local-libopts],
        [Force using the supplied libopts tearoff code]),[
     if test x$enableval = xyes ; then
        AC_MSG_NOTICE([Using supplied libopts tearoff])
-       LIBOPTS_LDADD='$(top_builddir)/sntp/libopts/libopts.la'
-       LIBOPTS_CFLAGS='-I$(top_srcdir)/sntp/libopts'
+       LIBOPTS_LDADD='$(top_builddir)/AO_Libopts_Dir/libopts.la'
+       LIBOPTS_CFLAGS='-I$(top_srcdir)/AO_Libopts_Dir'
        INVOKE_LIBOPTS_MACROS
        NEED_LIBOPTS_DIR=true
     fi])
@@ -404,8 +406,8 @@ AC_DEFUN([LIBOPTS_CHECK],[
       LIBOPTS_LDADD="${lo_cv_test_autoopts}"
       LIBOPTS_CFLAGS="`${aoconfig} --cflags`"
     else
-      LIBOPTS_LDADD='$(top_builddir)/sntp/libopts/libopts.la'
-      LIBOPTS_CFLAGS='-I$(top_srcdir)/sntp/libopts'
+      LIBOPTS_LDADD='$(top_builddir)/AO_Libopts_Dir/libopts.la'
+      LIBOPTS_CFLAGS='-I$(top_srcdir)/AO_Libopts_Dir'
       INVOKE_LIBOPTS_MACROS
       NEED_LIBOPTS_DIR=true
     fi
@@ -414,5 +416,6 @@ AC_DEFUN([LIBOPTS_CHECK],[
   AM_CONDITIONAL([NEED_LIBOPTS], [test -n "${NEED_LIBOPTS_DIR}"])
   AC_SUBST(LIBOPTS_LDADD)
   AC_SUBST(LIBOPTS_CFLAGS)
-  AC_CONFIG_FILES([sntp/libopts/Makefile])
+  AC_CONFIG_FILES(AO_Libopts_Dir[/Makefile])
+  m4_popdef([AO_Libopts_Dir])
 ]) # end of AC_DEFUN of LIBOPTS_CHECK

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 1cacb0a40cd59ceade59b64f6b516d472c718b72..8e6f72ad70613df488d7beac8b98dff9727e6644 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -69,5 +69,4 @@ sntp-opts.texi sntp-opts.menu: sntp-opts.def
        cd $(srcdir) && autogen -L ${prefix}/share/autogen \
                -Taginfo.tpl -DLEVEL=section sntp-opts.def
 
-
 include ../bincheck.mf

diff --git a/sntp/libopts.m4 b/sntp/libopts.m4
index c48cd1de44afeaa91db294800d0ce581073609e7..edc12c3472e067dd2dd5ae5fa0aac0d4eaa06cec 100644 (file)
--- a/sntp/libopts.m4
+++ b/sntp/libopts.m4
@@ -370,13 +370,15 @@ dnl Default to system libopts
 NEED_LIBOPTS_DIR=''
 
 AC_DEFUN([LIBOPTS_CHECK],[
+  m4_pushdef([AO_Libopts_Dir],
+    [ifelse([$1], , [libopts], [$1])])
   AC_ARG_ENABLE([local-libopts],
     AC_HELP_STRING([--enable-local-libopts],
        [Force using the supplied libopts tearoff code]),[
     if test x$enableval = xyes ; then
        AC_MSG_NOTICE([Using supplied libopts tearoff])
-       LIBOPTS_LDADD='$(top_builddir)/libopts/libopts.la'
-       LIBOPTS_CFLAGS='-I$(top_srcdir)/libopts'
+       LIBOPTS_LDADD='$(top_builddir)/AO_Libopts_Dir/libopts.la'
+       LIBOPTS_CFLAGS='-I$(top_srcdir)/AO_Libopts_Dir'
        INVOKE_LIBOPTS_MACROS
        NEED_LIBOPTS_DIR=true
     fi])
@@ -404,8 +406,8 @@ AC_DEFUN([LIBOPTS_CHECK],[
       LIBOPTS_LDADD="${lo_cv_test_autoopts}"
       LIBOPTS_CFLAGS="`${aoconfig} --cflags`"
     else
-      LIBOPTS_LDADD='$(top_builddir)/libopts/libopts.la'
-      LIBOPTS_CFLAGS='-I$(top_srcdir)/libopts'
+      LIBOPTS_LDADD='$(top_builddir)/AO_Libopts_Dir/libopts.la'
+      LIBOPTS_CFLAGS='-I$(top_srcdir)/AO_Libopts_Dir'
       INVOKE_LIBOPTS_MACROS
       NEED_LIBOPTS_DIR=true
     fi
@@ -414,5 +416,6 @@ AC_DEFUN([LIBOPTS_CHECK],[
   AM_CONDITIONAL([NEED_LIBOPTS], [test -n "${NEED_LIBOPTS_DIR}"])
   AC_SUBST(LIBOPTS_LDADD)
   AC_SUBST(LIBOPTS_CFLAGS)
-  AC_CONFIG_FILES([libopts/Makefile])
+  AC_CONFIG_FILES(AO_Libopts_Dir[/Makefile])
+  m4_popdef([AO_Libopts_Dir])
 ]) # end of AC_DEFUN of LIBOPTS_CHECK