From 992d92ffcde6c36e067f99774e3d1e96f3579a0f Mon Sep 17 00:00:00 2001
From: Thomas Ries <tries@gmx.net>
Date: Mon, 7 Apr 2003 18:09:32 +0000
Subject: [PATCH] - added siproxd.spec to autoconf process

---
 configure.in                    | 82 +++++++++++++++------------------
 siproxd.spec => siproxd.spec.in |  4 +-
 2 files changed, 38 insertions(+), 48 deletions(-)
 rename siproxd.spec => siproxd.spec.in (96%)

diff --git a/configure.in b/configure.in
index a2bd4a1..3986110 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,9 @@ dnl	22-Mar-2003	tries	check for sockaddr_t, hstrerror()
 dnl				--enable-almost-static (for Fli4l use)
 dnl				--enable-uclibc (uClibc building support)
 dnl	29-Mar-2003	tries	added support for libosip2
+dnl	 6-Apr-2003	tries	redone the fli4l specific build options
+dnl				now: --enable-fli4l-libc5, --enable-fli4l-uclibc
+dnl	 7-Apr-2003	tries	added siproxd.spex to autoconf process
 dnl
 dnl
 dnl
@@ -24,7 +27,7 @@ dnl Release Version
 dnl
 SPD_MAJOR_VERSION=0
 SPD_MINOR_VERSION=3
-SPD_MICRO_VERSION=2
+SPD_MICRO_VERSION=3
 
 SPD_VERSION=$SPD_MAJOR_VERSION.$SPD_MINOR_VERSION.$SPD_MICRO_VERSION
 
@@ -110,68 +113,53 @@ esac
 
 
 dnl
-dnl  uClibc support (only available on Linux, yet)
+dnl Feature:
+dnl  Fli4l uClibc support (only available on Linux, yet)
 dnl
+build_fli4l_uclibc="no"
 case "$target" in
   *-*-linux*)
-   uclibc_path="/usr/i386-linux-uclibc/"
-   AC_MSG_CHECKING("uClibc path")
-   AC_ARG_WITH(uclibc-path,
-      [  --with-uclibc-path=DIR      directory to uClibc development],
-      uclibc_path="$withval" )
-   AC_MSG_RESULT($uclibc_path)
-
-   AC_MSG_CHECKING("build against uClibc")
-   AC_ARG_ENABLE(uclibc,
-      [  --enable-uclibc             build against a uClibc],
-      build_uclibc=$enableval,
-      build_uclibc="no")
-   AC_MSG_RESULT($build_uclibc)
+   AC_MSG_CHECKING("build for FLI4L uClibc")
+   AC_ARG_ENABLE(fli4l-uclibc,
+      [  --enable-fli4l-uclibc       FLI4L: build for uClibc],
+      build_fli4l_uclibc=$enableval,)
+   AC_MSG_RESULT($build_fli4l_uclibc)
    ;;
 
   *)
-    AC_MSG_RESULT("FEATURE uclibc not available on this platform")
+    AC_MSG_RESULT("FEATURE fli4l-uclibc not available on this platform")
     ;;
 esac
 
-if test "x$build_uclibc" = "xyes"; then
-   CC=$uclibc_path/bin/i386-uclibc-gcc
-   LDD=$uclibc_path/bin/i386-uclibc-ldd
-   LD=$uclibc_path/bin/i386-uclibc-ld
-   CPPFLAGS=" -I $uclibc_path/include/ $CPPFLAGS"
-   LIBS=" -L  $uclibc_path/lib/ $LIBS"
-fi
-
-
 dnl
-dnl Features:
-dnl    almost-static	(only available on Linux, yet)
+dnl Feature:
+dnl    Flifl libc5 support (only available on Linux, yet)
 dnl
+build_fli4l_libc5="no"
 case "$target" in
   *-*-linux*)
-   AC_MSG_CHECKING("build almost static")
-   AC_ARG_ENABLE(almost-static,
-      [  --enable-almost-static       only link dynamically to libc, rest static],
-      build_almost_static=$enableval,
-      build_almost_static="no")
-   AC_MSG_RESULT($build_almost_static)
+   AC_MSG_CHECKING("building for FLI4L libc5")
+   AC_ARG_ENABLE(fli4l-libc5,
+      [  --enable-fli4l-libc5        FLI4L: build for libc5],
+      build_fli4l_libc5=$enableval,)
+   AC_MSG_RESULT($build_fli4l_libc5)
    ;;
 
   *)
-    AC_MSG_RESULT("FEATURE almost-static not available on this platform")
+    AC_MSG_RESULT("FEATURE fli4l-libc5 not available on this platform")
     ;;
 esac
-if test "x$build_almost_static" = "xyes"; then
-   if test "x$build_uclibc" = "xyes"; then
-      dnl uClibc: make libosip static
-      build_static_libosip="yes"
-      build_static_pthread="no"
-   else
-      dnl must be standard libc: make libosip and libpthread static
-      build_static_libosip="yes"
-      build_static_pthread="yes"
-   fi
+
+if test "x$build_fli4l_uclibc" = "xyes"; then
+   dnl FLI4l uClibc: make only libosip static
+   build_static_libosip="yes"
+   build_static_pthread="no"
+elif test "x$build_fli4l_libc5" = "xyes"; then
+   dnl FLI4l libc5: make libosip and libpthread static
+   build_static_libosip="yes"
+   build_static_pthread="yes"
 else
+   dnl build all dynamically linked
    build_static_libosip="no"
    build_static_pthread="no"
 fi
@@ -184,7 +172,7 @@ osiplib=osip
 have_osip2=no
 AC_MSG_CHECKING("force to use libosip1")
 AC_ARG_ENABLE(force-osip1,
-   [  --enable-force-osip1         force the use of libosip1],
+   [  --enable-force-osip1        force the use of libosip1],
    AC_MSG_RESULT("yes"),
    AC_MSG_RESULT("no")
    dnl do we have libosip2 available?
@@ -286,7 +274,9 @@ AC_SUBST(LIBS)
 dnl
 dnl Generate output files
 dnl
-AC_OUTPUT(Makefile \
+AC_OUTPUT( \
+siproxd.spec \
+Makefile \
 src/Makefile \
 doc/Makefile \
 scripts/Makefile \
diff --git a/siproxd.spec b/siproxd.spec.in
similarity index 96%
rename from siproxd.spec
rename to siproxd.spec.in
index 914b6b3..34ac987 100644
--- a/siproxd.spec
+++ b/siproxd.spec.in
@@ -1,5 +1,5 @@
-%define name		siproxd
-%define ver		0.3.2
+%define name		@PACKAGE@
+%define ver		@VERSION@
 %define release		1
 %define serial		1
 %define prefix		%{_prefix}